Skip to content

Commit 01f5439

Browse files
authored
Merge branch 'main' into readme-lpc55xpresso-feature
2 parents a346162 + de284eb commit 01f5439

File tree

5 files changed

+32
-18
lines changed

5 files changed

+32
-18
lines changed

.github/workflows/formatting.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
- uses: actions/checkout@v3
2121
- uses: dtolnay/rust-toolchain@stable
2222
with:
23-
toolchain: 1.69.0
23+
toolchain: 1.84.0
2424
components: clippy
2525
- run: cargo clippy -- --deny warnings

Cargo.lock

+24-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ allow-unsigned-images = []
1616
[dependencies]
1717
cfg-if = "1.0.0"
1818
cortex-m = { version = "0.7.7", features = ["inline-asm"] }
19-
cortex-m-rt = "0.7.3"
19+
cortex-m-rt = "0.7.5"
2020
crc = { version = "3.0.1", default-features = false }
2121
crc-catalog = "2.2.0"
2222
hex-literal = "0.4.1"
2323
lpc55-pac = { version = "0.5.0", features = ["rt"] }
24-
num-derive = { version = "0.3.3", default-features = false }
24+
num-derive = { version = "0.4.2", default-features = false }
2525
num-traits = { version = "0.2.15", default-features = false }
2626
static_assertions = "1.1.0"
2727
tinycrc = {path = "tinycrc"}

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "1.69.0"
2+
channel = "1.84.0"
33
targets = [ "thumbv8m.main-none-eabihf" ]
44
profile = "minimal"
55
components = [ "rustfmt" ]

src/bin/bootleby.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ fn check_for_override(
112112

113113
// Safety: the exclusivity check above is more than enough to make
114114
// obtaining a reference to this variable _once_ safe:
115-
unsafe { &mut TRANSIENT_OVERRIDE }
115+
#[allow(static_mut_refs)]
116+
unsafe {
117+
&mut TRANSIENT_OVERRIDE
118+
}
116119
};
117120
let transient_choice = bootleby::check_transient_override(shared_buffer);
118121

0 commit comments

Comments
 (0)