Skip to content

Commit 54a5de8

Browse files
committed
update: update dependencies and Rust
Signed-off-by: Dan Cross <cross@oxidecomputer.com>
1 parent e3cb6e0 commit 54a5de8

10 files changed

Lines changed: 98 additions & 90 deletions

File tree

Cargo.lock

Lines changed: 68 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bit_field = "0.10"
1717
bitflags = "2.9.0"
1818
bitstruct = "0.1"
1919
cpio_reader = "0.1"
20-
goblin = { version = "0.9", default-features = false, features = [
20+
goblin = { version = "0.10", default-features = false, features = [
2121
"endian_fd",
2222
"elf64",
2323
"elf32",
@@ -43,7 +43,7 @@ spin = { version = "0.10.0", default-features = false, features = [
4343
static_assertions = "1.1"
4444
x86 = "0.52"
4545
xmodem = { git = "https://github.com/oxidecomputer/xmodem.rs", default-features = false }
46-
zmodem2 = { git = "https://github.com/oxidecomputer/zmodem2", branch = "nostd", default-features = false }
46+
zmodem2 = { git = "https://github.com/oxidecomputer/zmodem2", default-features = false }
4747

4848
[profile.dev]
4949
panic = "abort"

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2025-04-22"
2+
channel = "nightly-2025-06-12"
33
components = [ "rustfmt", "rust-src", "llvm-tools", "clippy", "miri", "rust-analyzer" ]

src/allocator.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ impl BumpAlloc {
111111

112112
/// Attempts to allocate a region of memory of the given
113113
/// alignment and size.
114+
///
115+
/// Note that allocators are an explicit example of a use
116+
/// case where the clippy `mut_from_ref` lint gives false
117+
/// positives.
118+
#[allow(clippy::mut_from_ref)]
114119
pub(crate) fn alloc_bytes(
115120
&self,
116121
align: usize,

src/clock.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ pub const NANOS_PER_SEC: u128 = 1_000_000_000;
1212
/// Returns the clock frequency of the current CPU in Hertz.
1313
pub fn frequency() -> u128 {
1414
const DEFAULT_HZ: u128 = 2_000_000_000;
15-
if let Some(tsc_info) = cpuid::tscinfo() {
16-
if tsc_info.nominal_frequency() != 0 {
17-
return tsc_info
18-
.tsc_frequency()
19-
.map(|freq| freq.into())
20-
.unwrap_or(DEFAULT_HZ);
21-
}
15+
if let Some(tsc_info) = cpuid::tscinfo()
16+
&& tsc_info.nominal_frequency() != 0
17+
{
18+
return tsc_info
19+
.tsc_frequency()
20+
.map(|freq| freq.into())
21+
.unwrap_or(DEFAULT_HZ);
2222
}
2323
DEFAULT_HZ
2424
}

0 commit comments

Comments
 (0)