Skip to content

Commit be42d7d

Browse files
Freax13Freax13
committed
upgrade dependencies
1 parent 94d7b63 commit be42d7d

12 files changed

Lines changed: 595 additions & 54 deletions

File tree

‎host/Cargo.lock‎

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

‎host/mushroom/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ constants = { workspace = true }
2424
loader = { workspace = true }
2525
log-types = { workspace = true, features = ["std"] }
2626
mushroom-verify = { workspace = true, optional = true }
27-
nix = { version = "0.30.1", features = ["fs", "ioctl", "mman", "pthread", "resource", "signal", "time"] }
27+
nix = { version = "0.31.1", features = ["fs", "ioctl", "mman", "pthread", "resource", "signal", "time"] }
2828
profiler-types = { workspace = true }
2929
qgs-client = { workspace = true, optional = true }
30-
rand = "0.9.0"
30+
rand = "0.10.0"
3131
snp-types = { workspace = true, optional = true }
3232
supervisor-services = { workspace = true, optional = true }
3333
tdx-types = { workspace = true, optional = true }

‎host/vcek-kds/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ edition.workspace = true
77

88
[dependencies]
99
p384 = "0.13.0"
10-
reqwest = { version = "0.12.5", default-features = false, features = ["rustls-tls"] }
10+
reqwest = { version = "0.13.2", default-features = false, features = ["rustls"] }
1111
rsa = "0.9.6"
1212
sha2 = "0.10.8"
1313
snp-types = { workspace = true }
1414
thiserror = "2.0.9"
1515
x509-cert = { version = "0.2.5", default-features = false }
1616

1717
[target.'cfg(unix)'.dependencies]
18-
nix = { version = "0.30.1", features = ["ioctl"] }
18+
nix = { version = "0.31.1", features = ["ioctl"] }
1919
bytemuck = { version = "1.19.0", features = ["extern_crate_std"] }

‎tee/Cargo.lock‎

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

‎tee/example/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ edition.workspace = true
66
[dependencies]
77
anyhow = "1.0.81"
88
flate2 = "1.0.28"
9-
nix = { version = "0.30.1", default-features = false, features = ["mount"] }
9+
nix = { version = "0.31.1", default-features = false, features = ["mount"] }
1010
tar = "0.4.40"

‎tee/external-tests/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ edition.workspace = true
55

66
[dependencies]
77
anyhow = "1.0.81"
8-
nix = { version = "0.30.1", default-features = false, features = ["mount", "process", "time"] }
8+
nix = { version = "0.31.1", default-features = false, features = ["mount", "process", "time"] }
99
tar = "0.4.40"

‎tee/kernel/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ constants = { workspace = true, features = ["nightly"] }
2424
crossbeam-utils = { version = "0.8.19", default-features = false }
2525
either = { version = "1.15.0", default-features = false }
2626
futures = { version = "0.3.30", default-features = false, features = ["async-await"] }
27-
intrusive-collections = { version = "0.9.7", default-features = false, features = ["alloc", "nightly"] }
27+
intrusive-collections = { version = "0.10.0", default-features = false, features = ["alloc", "nightly"] }
2828
kernel-macros.workspace = true
2929
linkme = "0.3.25"
3030
log = { version = "0.4.21", default-features = false }

‎tee/kernel/src/rt.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct Task {
4545
spawn_location: &'static Location<'static>,
4646
}
4747

48-
intrusive_adapter!(TaskAdapter = Arc<Task>: Task { link: XorLinkedListAtomicLink });
48+
intrusive_adapter!(TaskAdapter = Arc<Task>: Task { link => XorLinkedListAtomicLink });
4949

5050
impl Task {
5151
#[track_caller]

‎tee/kernel/src/time.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ type DefaultBackend = real::RealBackend;
4141

4242
static DEFAULT_BACKEND: DefaultBackend = DefaultBackend::new();
4343

44-
intrusive_adapter!(TreeAdapter = Arc<Node>: Node { rb_link: RBTreeAtomicLink });
45-
intrusive_adapter!(ListAdapter = Arc<Node>: Node { list_link: LinkedListAtomicLink });
46-
intrusive_adapter!(DeleteListAdapter = Arc<Node>: Node { delete_link: LinkedListAtomicLink });
44+
intrusive_adapter!(TreeAdapter = Arc<Node>: Node { rb_link => RBTreeAtomicLink });
45+
intrusive_adapter!(ListAdapter = Arc<Node>: Node { list_link => LinkedListAtomicLink });
46+
intrusive_adapter!(DeleteListAdapter = Arc<Node>: Node { delete_link => LinkedListAtomicLink });
4747

4848
static REALTIME_TIMERS: TimerLists = TimerLists::new();
4949
static REALTIME: Time = unsafe { Time::new(&REALTIME_TIMERS, &DEFAULT_BACKEND) };

‎tee/kernel/src/user/futex.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::{
1616
spin::mutex::Mutex,
1717
};
1818

19-
intrusive_adapter!(ListAdapter = Arc<FutexWaiter>: FutexWaiter { link: LinkedListAtomicLink });
19+
intrusive_adapter!(ListAdapter = Arc<FutexWaiter>: FutexWaiter { link => LinkedListAtomicLink });
2020

2121
pub struct Futexes {
2222
futexes: Mutex<BTreeMap<usize, LinkedList<ListAdapter>>>,

0 commit comments

Comments
 (0)