Skip to content

Commit

Permalink
Bump Rust to version 1.77
Browse files Browse the repository at this point in the history
When trying to build rowan we get this error

    error: package `rowan v0.15.16` cannot be built because
    it requires rustc 1.77.0 or newer, while the currently active rustc
    version is 1.75.0

So let's upgrade to 1.77 to allow us to build rowan.
  • Loading branch information
wprzytula committed Aug 28, 2024
1 parent 1dc6133 commit 4993944
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version = "0.1.0"
[workspace.package]
# This must be kept in sync with rust-toolchain.toml; please see that file for
# more information.
rust-version = "1.75"
rust-version = "1.77"

[features]
rust_embedded = [
Expand Down
12 changes: 7 additions & 5 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
# you'd like to use. When you do so, update this to the first Rust version that
# includes that feature. Whenever this value is updated, the rust-version field
# in Cargo.toml must be updated as well.
channel = "1.75"
channel = "1.77"
components = ["clippy", "rustfmt"]
targets = ["thumbv6m-none-eabi",
"thumbv7em-none-eabi",
"riscv32imac-unknown-none-elf",
"riscv32imc-unknown-none-elf"]
targets = [
"thumbv6m-none-eabi",
"thumbv7em-none-eabi",
"riscv32imac-unknown-none-elf",
"riscv32imc-unknown-none-elf",
]
2 changes: 1 addition & 1 deletion tock
Submodule tock updated 654 files
2 changes: 1 addition & 1 deletion unittest/src/kernel_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub(crate) struct KernelData {

// KERNEL_DATA is set to Some in `fake::Kernel::new` and set to None when the
// `fake::Kernel` is dropped.
thread_local!(pub(crate) static KERNEL_DATA: RefCell<Option<KernelData>> = RefCell::new(None));
thread_local!(pub(crate) static KERNEL_DATA: RefCell<Option<KernelData>> = const { RefCell::new(None) });

// Convenience function to get mutable access to KERNEL_DATA.
pub(crate) fn with_kernel_data<F: FnOnce(Option<&mut KernelData>) -> R, R>(f: F) -> R {
Expand Down

0 comments on commit 4993944

Please sign in to comment.