From 76b95f66e0e6494125d00716ab81e65f2908afb1 Mon Sep 17 00:00:00 2001 From: atse Date: Tue, 16 Jan 2024 15:22:11 +0800 Subject: [PATCH] Use latest working stable rust --- flake.nix | 8 ++++---- src/dfu.rs | 1 + src/main.rs | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 40ab983..803e774 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,8 @@ let pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; rustManifest = pkgs.fetchurl { - url = "https://static.rust-lang.org/dist/2021-10-26/channel-rust-nightly.toml"; - sha256 = "sha256-1hLbypXA+nuH7o3AHCokzSBZAvQxvef4x9+XxO3aBao="; + url = "https://static.rust-lang.org/dist/2022-12-15/channel-rust-stable.toml"; + hash = "sha256-S7epLlflwt0d1GZP44u5Xosgf6dRrmr8xxC+Ml2Pq7c="; }; targets = [ @@ -22,12 +22,12 @@ inherit targets; extensions = ["rust-src"]; }; - rust = rustChannelOfTargets "nightly" null targets; + rust = rustChannelOfTargets "stable" null targets; rustPlatform = pkgs.recurseIntoAttrs (pkgs.makeRustPlatform { rustc = rust; cargo = rust; }); - thermostat = rustPlatform.buildRustPackage rec { + thermostat = rustPlatform.buildRustPackage { name = "thermostat"; version = "0.0.0"; diff --git a/src/dfu.rs b/src/dfu.rs index 1317212..9601472 100644 --- a/src/dfu.rs +++ b/src/dfu.rs @@ -1,3 +1,4 @@ +use core::arch::asm; use cortex_m_rt::pre_init; use stm32f4xx_hal::stm32::{RCC, SYSCFG}; diff --git a/src/main.rs b/src/main.rs index 7271a32..3c01d74 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,5 @@ #![cfg_attr(not(test), no_std)] #![cfg_attr(not(test), no_main)] -#![feature(maybe_uninit_extra, asm)] #![cfg_attr(test, allow(unused))] // TODO: #![deny(warnings, unused)]