Skip to content

Commit 109ada8

Browse files
beepster4096beepster4096
committed
undo some lockfile changes, add explicit types to tests
1 parent ac9368a commit 109ada8

File tree

6 files changed

+91
-109
lines changed

6 files changed

+91
-109
lines changed

‎src/tools/miri/test_dependencies/Cargo.lock

+44-44
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ dependencies = [
8484

8585
[[package]]
8686
name = "getrandom"
87-
version = "0.2.11"
87+
version = "0.2.10"
8888
source = "registry+https://github.com/rust-lang/crates.io-index"
89-
checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
89+
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
9090
dependencies = [
9191
"cfg-if",
9292
"js-sys",
@@ -97,9 +97,9 @@ dependencies = [
9797

9898
[[package]]
9999
name = "gimli"
100-
version = "0.28.1"
100+
version = "0.28.0"
101101
source = "registry+https://github.com/rust-lang/crates.io-index"
102-
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
102+
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
103103

104104
[[package]]
105105
name = "hermit-abi"
@@ -109,24 +109,24 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
109109

110110
[[package]]
111111
name = "js-sys"
112-
version = "0.3.66"
112+
version = "0.3.64"
113113
source = "registry+https://github.com/rust-lang/crates.io-index"
114-
checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
114+
checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
115115
dependencies = [
116116
"wasm-bindgen",
117117
]
118118

119119
[[package]]
120120
name = "libc"
121-
version = "0.2.151"
121+
version = "0.2.148"
122122
source = "registry+https://github.com/rust-lang/crates.io-index"
123-
checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
123+
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
124124

125125
[[package]]
126126
name = "lock_api"
127-
version = "0.4.11"
127+
version = "0.4.10"
128128
source = "registry+https://github.com/rust-lang/crates.io-index"
129-
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
129+
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
130130
dependencies = [
131131
"autocfg",
132132
"scopeguard",
@@ -155,9 +155,9 @@ dependencies = [
155155

156156
[[package]]
157157
name = "mio"
158-
version = "0.8.10"
158+
version = "0.8.8"
159159
source = "registry+https://github.com/rust-lang/crates.io-index"
160-
checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
160+
checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
161161
dependencies = [
162162
"libc",
163163
"wasi 0.11.0+wasi-snapshot-preview1",
@@ -169,7 +169,7 @@ name = "miri-test-deps"
169169
version = "0.1.0"
170170
dependencies = [
171171
"getrandom 0.1.16",
172-
"getrandom 0.2.11",
172+
"getrandom 0.2.10",
173173
"libc",
174174
"num_cpus",
175175
"page_size",
@@ -190,18 +190,18 @@ dependencies = [
190190

191191
[[package]]
192192
name = "object"
193-
version = "0.32.2"
193+
version = "0.32.1"
194194
source = "registry+https://github.com/rust-lang/crates.io-index"
195-
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
195+
checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
196196
dependencies = [
197197
"memchr",
198198
]
199199

200200
[[package]]
201201
name = "once_cell"
202-
version = "1.19.0"
202+
version = "1.18.0"
203203
source = "registry+https://github.com/rust-lang/crates.io-index"
204-
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
204+
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
205205

206206
[[package]]
207207
name = "page_size"
@@ -225,9 +225,9 @@ dependencies = [
225225

226226
[[package]]
227227
name = "parking_lot_core"
228-
version = "0.9.9"
228+
version = "0.9.8"
229229
source = "registry+https://github.com/rust-lang/crates.io-index"
230-
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
230+
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
231231
dependencies = [
232232
"cfg-if",
233233
"libc",
@@ -250,9 +250,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
250250

251251
[[package]]
252252
name = "proc-macro2"
253-
version = "1.0.71"
253+
version = "1.0.67"
254254
source = "registry+https://github.com/rust-lang/crates.io-index"
255-
checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
255+
checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
256256
dependencies = [
257257
"unicode-ident",
258258
]
@@ -293,14 +293,14 @@ version = "0.6.4"
293293
source = "registry+https://github.com/rust-lang/crates.io-index"
294294
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
295295
dependencies = [
296-
"getrandom 0.2.11",
296+
"getrandom 0.2.10",
297297
]
298298

299299
[[package]]
300300
name = "redox_syscall"
301-
version = "0.4.1"
301+
version = "0.3.5"
302302
source = "registry+https://github.com/rust-lang/crates.io-index"
303-
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
303+
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
304304
dependencies = [
305305
"bitflags",
306306
]
@@ -328,25 +328,25 @@ dependencies = [
328328

329329
[[package]]
330330
name = "smallvec"
331-
version = "1.11.2"
331+
version = "1.11.1"
332332
source = "registry+https://github.com/rust-lang/crates.io-index"
333-
checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
333+
checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
334334

335335
[[package]]
336336
name = "socket2"
337-
version = "0.5.5"
337+
version = "0.5.4"
338338
source = "registry+https://github.com/rust-lang/crates.io-index"
339-
checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
339+
checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
340340
dependencies = [
341341
"libc",
342342
"windows-sys 0.48.0",
343343
]
344344

345345
[[package]]
346346
name = "syn"
347-
version = "2.0.43"
347+
version = "2.0.37"
348348
source = "registry+https://github.com/rust-lang/crates.io-index"
349-
checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
349+
checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
350350
dependencies = [
351351
"proc-macro2",
352352
"quote",
@@ -355,9 +355,9 @@ dependencies = [
355355

356356
[[package]]
357357
name = "tokio"
358-
version = "1.35.1"
358+
version = "1.32.0"
359359
source = "registry+https://github.com/rust-lang/crates.io-index"
360-
checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
360+
checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
361361
dependencies = [
362362
"backtrace",
363363
"bytes",
@@ -374,9 +374,9 @@ dependencies = [
374374

375375
[[package]]
376376
name = "tokio-macros"
377-
version = "2.2.0"
377+
version = "2.1.0"
378378
source = "registry+https://github.com/rust-lang/crates.io-index"
379-
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
379+
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
380380
dependencies = [
381381
"proc-macro2",
382382
"quote",
@@ -403,19 +403,19 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
403403

404404
[[package]]
405405
name = "wasm-bindgen"
406-
version = "0.2.89"
406+
version = "0.2.87"
407407
source = "registry+https://github.com/rust-lang/crates.io-index"
408-
checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
408+
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
409409
dependencies = [
410410
"cfg-if",
411411
"wasm-bindgen-macro",
412412
]
413413

414414
[[package]]
415415
name = "wasm-bindgen-backend"
416-
version = "0.2.89"
416+
version = "0.2.87"
417417
source = "registry+https://github.com/rust-lang/crates.io-index"
418-
checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
418+
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
419419
dependencies = [
420420
"bumpalo",
421421
"log",
@@ -428,19 +428,19 @@ dependencies = [
428428

429429
[[package]]
430430
name = "wasm-bindgen-macro"
431-
version = "0.2.89"
431+
version = "0.2.87"
432432
source = "registry+https://github.com/rust-lang/crates.io-index"
433-
checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
433+
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
434434
dependencies = [
435435
"quote",
436436
"wasm-bindgen-macro-support",
437437
]
438438

439439
[[package]]
440440
name = "wasm-bindgen-macro-support"
441-
version = "0.2.89"
441+
version = "0.2.87"
442442
source = "registry+https://github.com/rust-lang/crates.io-index"
443-
checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
443+
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
444444
dependencies = [
445445
"proc-macro2",
446446
"quote",
@@ -451,9 +451,9 @@ dependencies = [
451451

452452
[[package]]
453453
name = "wasm-bindgen-shared"
454-
version = "0.2.89"
454+
version = "0.2.87"
455455
source = "registry+https://github.com/rust-lang/crates.io-index"
456-
checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
456+
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
457457

458458
[[package]]
459459
name = "winapi"

‎src/tools/miri/tests/fail-dep/concurrency/windows_join_detached.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
use std::os::windows::io::AsRawHandle;
77
use std::thread;
88

9-
use windows_sys::Win32::Foundation::CloseHandle;
9+
use windows_sys::Win32::Foundation::{CloseHandle, HANDLE};
1010

1111
fn main() {
1212
let thread = thread::spawn(|| ());
1313

1414
unsafe {
15-
assert_ne!(CloseHandle(thread.as_raw_handle() as _), 0);
15+
assert_ne!(CloseHandle(thread.as_raw_handle() as HANDLE), 0);
1616
}
1717

1818
thread.join().unwrap();

‎src/tools/miri/tests/pass-dep/concurrency/windows_condvar_shared.rs

+19-15
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
// We are making scheduler assumptions here.
33
//@compile-flags: -Zmiri-preemption-rate=0
44

5-
use std::mem::MaybeUninit;
5+
use std::ptr::null_mut;
66
use std::thread;
77

88
use windows_sys::Win32::System::Threading::{
99
AcquireSRWLockExclusive, AcquireSRWLockShared, ReleaseSRWLockExclusive, ReleaseSRWLockShared,
10-
SleepConditionVariableSRW, WakeAllConditionVariable, CONDITION_VARIABLE_LOCKMODE_SHARED,
11-
INFINITE,
10+
SleepConditionVariableSRW, WakeAllConditionVariable, CONDITION_VARIABLE,
11+
CONDITION_VARIABLE_LOCKMODE_SHARED, INFINITE, SRWLOCK,
1212
};
1313

14+
// not in windows-sys
15+
const SRWLOCK_INIT: SRWLOCK = SRWLOCK { Ptr: null_mut() };
16+
const CONDITION_VARIABLE_INIT: CONDITION_VARIABLE = CONDITION_VARIABLE { Ptr: null_mut() };
17+
1418
#[derive(Copy, Clone)]
1519
struct SendPtr<T>(*mut T);
1620

@@ -20,11 +24,11 @@ unsafe impl<T> Send for SendPtr<T> {}
2024
fn all_shared() {
2125
println!("all_shared");
2226

23-
let mut lock = MaybeUninit::zeroed();
24-
let mut condvar = MaybeUninit::zeroed();
27+
let mut lock = SRWLOCK_INIT;
28+
let mut condvar = CONDITION_VARIABLE_INIT;
2529

26-
let lock_ptr = SendPtr(lock.as_mut_ptr());
27-
let condvar_ptr = SendPtr(condvar.as_mut_ptr());
30+
let lock_ptr = SendPtr(&mut lock);
31+
let condvar_ptr = SendPtr(&mut condvar);
2832

2933
let mut handles = Vec::with_capacity(10);
3034

@@ -92,11 +96,11 @@ fn all_shared() {
9296
fn shared_sleep_and_exclusive_lock() {
9397
println!("shared_sleep_and_exclusive_lock");
9498

95-
let mut lock = MaybeUninit::zeroed();
96-
let mut condvar = MaybeUninit::zeroed();
99+
let mut lock = SRWLOCK_INIT;
100+
let mut condvar = CONDITION_VARIABLE_INIT;
97101

98-
let lock_ptr = SendPtr(lock.as_mut_ptr());
99-
let condvar_ptr = SendPtr(condvar.as_mut_ptr());
102+
let lock_ptr = SendPtr(&mut lock);
103+
let condvar_ptr = SendPtr(&mut condvar);
100104

101105
let mut waiters = Vec::with_capacity(5);
102106
for i in 0..5 {
@@ -153,11 +157,11 @@ fn shared_sleep_and_exclusive_lock() {
153157
fn exclusive_sleep_and_shared_lock() {
154158
println!("exclusive_sleep_and_shared_lock");
155159

156-
let mut lock = MaybeUninit::zeroed();
157-
let mut condvar = MaybeUninit::zeroed();
160+
let mut lock = SRWLOCK_INIT;
161+
let mut condvar = CONDITION_VARIABLE_INIT;
158162

159-
let lock_ptr = SendPtr(lock.as_mut_ptr());
160-
let condvar_ptr = SendPtr(condvar.as_mut_ptr());
163+
let lock_ptr = SendPtr(&mut lock);
164+
let condvar_ptr = SendPtr(&mut condvar);
161165

162166
let mut handles = Vec::with_capacity(10);
163167
for i in 0..5 {

‎src/tools/miri/tests/pass-dep/concurrency/windows_detach_terminated.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
use std::os::windows::io::IntoRawHandle;
66
use std::thread;
77

8-
use windows_sys::Win32::Foundation::CloseHandle;
8+
use windows_sys::Win32::Foundation::{CloseHandle, HANDLE};
99

1010
fn main() {
11-
let thread = thread::spawn(|| {}).into_raw_handle();
11+
let thread = thread::spawn(|| {}).into_raw_handle() as HANDLE;
1212

1313
// this yield ensures that `thread` is terminated by this point
1414
thread::yield_now();
1515

1616
unsafe {
17-
assert_ne!(CloseHandle(thread as _), 0);
17+
assert_ne!(CloseHandle(thread), 0);
1818
}
1919
}

0 commit comments

Comments
 (0)