Skip to content

Commit ec458fb

Browse files
numas13numas13
committed
all: update dependencies
1 parent c5bf2bd commit ec458fb

File tree

9 files changed

+629
-462
lines changed

9 files changed

+629
-462
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ repository = "https://github.com/FWGS/xash3d-master"
1818
[workspace.dependencies]
1919
xash3d-protocol = { path = "protocol", version = "0.2.0", features = ["net"] }
2020
xash3d-observer = { path = "observer", version = "0.1.0" }
21-
log = "0.4.18"
21+
log = "0.4"
2222
bitflags = "2.4"
23-
thiserror = "1.0.49"
23+
thiserror = "2"
2424
getopts = "0.2.21"
2525
blake2b_simd = "1.0"
2626
serde = { version = "1.0.188", features = ["derive"] }
27+
crossterm = { version = "0.28", default-features = false, features = ["events", "bracketed-paste"] }
2728

2829
[profile.release]
2930
codegen-units = 1

‎admin/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ repository.workspace = true
1414
[dependencies]
1515
thiserror.workspace = true
1616
getopts.workspace = true
17-
crossterm = "0.25.0"
17+
crossterm.workspace = true
1818
blake2b_simd.workspace = true
1919
xash3d-protocol.workspace = true

‎master/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![deny(unsafe_code)]
2+
13
mod cleanup;
24
mod master_server;
35
mod stats;

‎master/src/str_arr.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl<const N: usize> StrArr<N> {
3030
}
3131

3232
pub fn as_str(&self) -> &str {
33-
// SAFETY: checked in constructor
34-
unsafe { str::from_utf8_unchecked(self.as_bytes()) }
33+
// checked in constructor
34+
str::from_utf8(self.as_bytes()).unwrap()
3535
}
3636
}

‎query/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ getopts.workspace = true
2222
fastrand = "2.0.1"
2323
serde.workspace = true
2424
serde_json = "1.0.107"
25-
crossterm = { version = "0.25.0", default-features = false, optional = true }
25+
crossterm = { workspace = true, optional = true }
2626
xash3d-protocol.workspace = true
2727
xash3d-observer.workspace = true

‎supply-chain/audits.toml‎

Lines changed: 100 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,23 @@ who = "Denis Drakhnia <numas13@gmail.com>"
2121
criteria = "safe-to-deploy"
2222
version = "1.3.2"
2323

24+
[[audits.bitflags]]
25+
who = "Denis Drakhnia <numas13@gmail.com>"
26+
criteria = "safe-to-deploy"
27+
delta = "2.8.0 -> 2.9.0"
28+
notes = "Minor changes."
29+
2430
[[audits.blake2b_simd]]
2531
who = "Denis Drakhnia <numas13@gmail.com>"
2632
criteria = "safe-to-deploy"
2733
version = "1.0.0"
2834

35+
[[audits.blake2b_simd]]
36+
who = "Denis Drakhnia <numas13@gmail.com>"
37+
criteria = "safe-to-deploy"
38+
delta = "1.0.2 -> 1.0.3"
39+
notes = "Updated Rust edition."
40+
2941
[[audits.cc]]
3042
who = "Denis Drakhnia <numas13@gmail.com>"
3143
criteria = "safe-to-deploy"
@@ -56,11 +68,38 @@ who = "Denis Drakhnia <numas13@gmail.com>"
5668
criteria = "safe-to-deploy"
5769
version = "0.25.0"
5870

71+
[[audits.crossterm]]
72+
who = "Denis Drakhnia <numas13@gmail.com>"
73+
criteria = "safe-to-deploy"
74+
delta = "0.25.0 -> 0.26.1"
75+
76+
[[audits.crossterm]]
77+
who = "Denis Drakhnia <numas13@gmail.com>"
78+
criteria = "safe-to-deploy"
79+
delta = "0.26.1 -> 0.27.0"
80+
81+
[[audits.crossterm]]
82+
who = "Denis Drakhnia <numas13@gmail.com>"
83+
criteria = "safe-to-deploy"
84+
delta = "0.27.0 -> 0.28.1"
85+
86+
[[audits.crunchy]]
87+
who = "Denis Drakhnia <numas13@gmail.com>"
88+
criteria = "safe-to-deploy"
89+
delta = "0.2.2 -> 0.2.3"
90+
notes = "Minor changes."
91+
5992
[[audits.fastrand]]
6093
who = "Denis Drakhnia <numas13@gmail.com>"
6194
criteria = "safe-to-deploy"
6295
delta = "2.0.1 -> 2.0.2"
6396

97+
[[audits.fastrand]]
98+
who = "Denis Drakhnia <numas13@gmail.com>"
99+
criteria = "safe-to-deploy"
100+
delta = "2.1.1 -> 2.3.0"
101+
notes = "Minor changes."
102+
64103
[[audits.getrandom]]
65104
who = "Denis Drakhnia <numas13@gmail.com>"
66105
criteria = "safe-to-deploy"
@@ -71,16 +110,34 @@ who = "Denis Drakhnia <numas13@gmail.com>"
71110
criteria = "safe-to-deploy"
72111
delta = "0.1.59 -> 0.1.60"
73112

113+
[[audits.js-sys]]
114+
who = "Denis Drakhnia <numas13@gmail.com>"
115+
criteria = "safe-to-deploy"
116+
delta = "0.3.76 -> 0.3.77"
117+
notes = "Unsafe code is guarded by assert."
118+
74119
[[audits.libc]]
75120
who = "Denis Drakhnia <numas13@gmail.com>"
76121
criteria = "safe-to-deploy"
77122
delta = "0.2.154 -> 0.2.155"
78123

124+
[[audits.log]]
125+
who = "Denis Drakhnia <numas13@gmail.com>"
126+
criteria = "safe-to-deploy"
127+
delta = "0.4.25 -> 0.4.26"
128+
notes = "Minor changes."
129+
79130
[[audits.mio]]
80131
who = "Denis Drakhnia <numas13@gmail.com>"
81132
criteria = "safe-to-run"
82133
delta = "0.7.4 -> 0.8.11"
83134

135+
[[audits.mio]]
136+
who = "Denis Drakhnia <numas13@gmail.com>"
137+
criteria = "safe-to-deploy"
138+
delta = "0.8.11 -> 1.0.3"
139+
notes = "More OS supported. Unsafe code looks normal."
140+
84141
[[audits.numtoa]]
85142
who = "Denis Drakhnia <numas13@gmail.com>"
86143
criteria = "safe-to-deploy"
@@ -106,6 +163,11 @@ who = "Denis Drakhnia <numas13@gmail.com>"
106163
criteria = "safe-to-deploy"
107164
version = "0.2.3"
108165

166+
[[audits.signal-hook-mio]]
167+
who = "Denis Drakhnia <numas13@gmail.com>"
168+
criteria = "safe-to-deploy"
169+
delta = "0.2.3 -> 0.2.4"
170+
109171
[[audits.signal-hook-registry]]
110172
who = "Denis Drakhnia <numas13@gmail.com>"
111173
criteria = "safe-to-deploy"
@@ -141,16 +203,34 @@ end = "2025-04-04"
141203

142204
[[trusted.libc]]
143205
criteria = "safe-to-deploy"
144-
user-id = 51017 # Yuki Okushi (JohnTitor)
206+
user-id = 51017
145207
start = "2020-03-17"
146208
end = "2025-04-04"
147209

210+
[[trusted.libc]]
211+
criteria = "safe-to-deploy"
212+
user-id = 55123 # rust-lang-owner
213+
start = "2024-08-15"
214+
end = "2026-03-04"
215+
216+
[[trusted.linux-raw-sys]]
217+
criteria = "safe-to-deploy"
218+
user-id = 6825 # Dan Gohman (sunfishcode)
219+
start = "2021-06-12"
220+
end = "2026-03-04"
221+
148222
[[trusted.lock_api]]
149223
criteria = "safe-to-deploy"
150224
user-id = 2915 # Amanieu d'Antras (Amanieu)
151225
start = "2019-05-04"
152226
end = "2025-04-07"
153227

228+
[[trusted.memchr]]
229+
criteria = "safe-to-deploy"
230+
user-id = 189 # Andrew Gallant (BurntSushi)
231+
start = "2019-07-07"
232+
end = "2026-03-04"
233+
154234
[[trusted.mio]]
155235
criteria = "safe-to-deploy"
156236
user-id = 10
@@ -159,7 +239,7 @@ end = "2025-04-07"
159239

160240
[[trusted.num-traits]]
161241
criteria = "safe-to-deploy"
162-
user-id = 539 # Josh Stone (cuviper)
242+
user-id = 539
163243
start = "2019-05-20"
164244
end = "2025-04-04"
165245

@@ -187,6 +267,18 @@ user-id = 3618 # David Tolnay (dtolnay)
187267
start = "2019-04-09"
188268
end = "2025-04-04"
189269

270+
[[trusted.rustix]]
271+
criteria = "safe-to-deploy"
272+
user-id = 6825 # Dan Gohman (sunfishcode)
273+
start = "2021-10-29"
274+
end = "2026-03-04"
275+
276+
[[trusted.rustversion]]
277+
criteria = "safe-to-deploy"
278+
user-id = 3618 # David Tolnay (dtolnay)
279+
start = "2019-07-08"
280+
end = "2026-03-04"
281+
190282
[[trusted.ryu]]
191283
criteria = "safe-to-deploy"
192284
user-id = 3618 # David Tolnay (dtolnay)
@@ -247,6 +339,12 @@ user-id = 1 # Alex Crichton (alexcrichton)
247339
start = "2019-05-16"
248340
end = "2025-04-04"
249341

342+
[[trusted.unicode-ident]]
343+
criteria = "safe-to-deploy"
344+
user-id = 3618 # David Tolnay (dtolnay)
345+
start = "2021-10-02"
346+
end = "2026-03-04"
347+
250348
[[trusted.wasi]]
251349
criteria = "safe-to-deploy"
252350
user-id = 1 # Alex Crichton (alexcrichton)

‎supply-chain/config.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# cargo-vet config file
33

44
[cargo-vet]
5-
version = "0.9"
5+
version = "0.10"
66

77
[imports.bytecode-alliance]
88
url = "https://raw.githubusercontent.com/bytecodealliance/wasmtime/main/supply-chain/audits.toml"
@@ -31,26 +31,26 @@ audit-as-crates-io = true
3131
[policy.xash3d-query]
3232
audit-as-crates-io = true
3333

34-
[[exemptions.crossterm_winapi]]
35-
version = "0.9.1"
34+
[[exemptions.chrono]]
35+
version = "0.4.40"
3636
criteria = "safe-to-deploy"
3737

3838
[[exemptions.mio]]
3939
version = "0.8.10"
4040
criteria = "safe-to-deploy"
4141

4242
[[exemptions.redox_syscall]]
43-
version = "0.5.1"
43+
version = "0.5.10"
4444
criteria = "safe-to-deploy"
4545

46-
[[exemptions.winapi]]
47-
version = "0.3.9"
46+
[[exemptions.wasm-bindgen]]
47+
version = "0.2.100"
4848
criteria = "safe-to-deploy"
4949

50-
[[exemptions.winapi-i686-pc-windows-gnu]]
51-
version = "0.4.0"
50+
[[exemptions.wasm-bindgen-macro]]
51+
version = "0.2.100"
5252
criteria = "safe-to-deploy"
5353

54-
[[exemptions.winapi-x86_64-pc-windows-gnu]]
55-
version = "0.4.0"
54+
[[exemptions.windows-link]]
55+
version = "0.1.0"
5656
criteria = "safe-to-deploy"

0 commit comments

Comments
 (0)