Skip to content

Commit a482657

Browse files
sunfishcodesunfishcode
authored
Use manual inits in tests to avoid dev-dependeing on the ctor crate. (#1081)
The `ctor` crate recently started to cause link errors: = note: symbols.o : error LNK2001: unresolved external symbol _ZN3net34windows_shutdown___rust_dtor___mod13__dtor_export17h23ee8b3200f4e26dE symbols.o : error LNK2001: unresolved external symbol _ZN3net34windows_startup___rust_ctor___ctor17hd7d3fdaa3ef2ca94E D:\a\rustix\rustix\target\release\deps\net-f008608c7b4f9589.exe : fatal error LNK1120: 2 unresolved externals so add manual inits to the net tests so that we don't need to depend on the ctor crate.
1 parent ccfc4d9 commit a482657

File tree

10 files changed

+146
-14
lines changed

10 files changed

+146
-14
lines changed

‎Cargo.toml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ static_assertions = "1.1.0"
8484
[target.'cfg(all(criterion, not(any(target_os = "emscripten", target_os = "wasi"))))'.dev-dependencies]
8585
criterion = "0.4"
8686

87-
[target.'cfg(windows)'.dev-dependencies]
88-
ctor = "0.2.0"
89-
9087
# Add Criterion configuration, as described here:
9188
# <https://bheisler.github.io/criterion.rs/book/getting_started.html#step-1---add-dependency-to-cargotoml>
9289
[[bench]]

‎tests/net/connect_bind_send.rs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
99
/// Test `connect_any`.
1010
#[test]
1111
fn net_v4_connect_any() {
12+
crate::init();
13+
1214
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
1315
let addr = SocketAddr::new(localhost, 0);
1416
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -40,6 +42,8 @@ fn net_v4_connect_any() {
4042
#[cfg(not(any(apple, windows, target_os = "haiku")))]
4143
#[test]
4244
fn net_v4_connect_any_accept_with() {
45+
crate::init();
46+
4347
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
4448
let addr = SocketAddr::new(localhost, 0);
4549
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -70,6 +74,8 @@ fn net_v4_connect_any_accept_with() {
7074
/// Similar, but with V6.
7175
#[test]
7276
fn net_v6_connect_any() {
77+
crate::init();
78+
7379
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
7480
let addr = SocketAddr::new(localhost, 0);
7581
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -101,6 +107,8 @@ fn net_v6_connect_any() {
101107
#[cfg(not(any(apple, windows, target_os = "haiku")))]
102108
#[test]
103109
fn net_v6_connect_any_accept_with() {
110+
crate::init();
111+
104112
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
105113
let addr = SocketAddr::new(localhost, 0);
106114
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -131,6 +139,8 @@ fn net_v6_connect_any_accept_with() {
131139
/// Test `connect` with a `SocketAddr`.
132140
#[test]
133141
fn net_v4_connect() {
142+
crate::init();
143+
134144
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
135145
let addr = SocketAddr::new(localhost, 0);
136146
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -164,6 +174,8 @@ fn net_v4_connect() {
164174
/// Similar, but use V6.
165175
#[test]
166176
fn net_v6_connect() {
177+
crate::init();
178+
167179
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
168180
let addr = SocketAddr::new(localhost, 0);
169181
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -197,6 +209,8 @@ fn net_v6_connect() {
197209
/// Test `connect_unspec`.
198210
#[test]
199211
fn net_v4_connect_unspec() {
212+
crate::init();
213+
200214
const SOME_PORT: u16 = 47;
201215
let localhost_addr = SocketAddrV4::new(Ipv4Addr::LOCALHOST, SOME_PORT);
202216

@@ -241,6 +255,8 @@ fn net_v4_connect_unspec() {
241255
/// Test `connect_unspec`.
242256
#[test]
243257
fn net_v6_connect_unspec() {
258+
crate::init();
259+
244260
const SOME_PORT: u16 = 47;
245261
let localhost_addr = SocketAddrV6::new(Ipv6Addr::LOCALHOST, SOME_PORT, 0, 0);
246262

@@ -285,6 +301,8 @@ fn net_v6_connect_unspec() {
285301
/// Test `bind_any`.
286302
#[test]
287303
fn net_v4_bind_any() {
304+
crate::init();
305+
288306
let localhost = Ipv4Addr::LOCALHOST;
289307
let addr = SocketAddrV4::new(localhost, 0).into();
290308
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -314,6 +332,8 @@ fn net_v4_bind_any() {
314332
/// Similar, but use V6.
315333
#[test]
316334
fn net_v6_bind_any() {
335+
crate::init();
336+
317337
let localhost = Ipv6Addr::LOCALHOST;
318338
let addr = SocketAddrAny::V6(SocketAddrV6::new(localhost, 0, 0, 0));
319339
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -343,6 +363,8 @@ fn net_v6_bind_any() {
343363
/// Test `sendto`.
344364
#[test]
345365
fn net_v4_sendto() {
366+
crate::init();
367+
346368
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
347369
let addr = SocketAddr::new(localhost, 0);
348370
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -378,6 +400,8 @@ fn net_v4_sendto() {
378400
/// Similar, but with V6.
379401
#[test]
380402
fn net_v6_sendto() {
403+
crate::init();
404+
381405
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
382406
let addr = SocketAddr::new(localhost, 0);
383407
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -413,6 +437,8 @@ fn net_v6_sendto() {
413437
/// Test `sendto_any`.
414438
#[test]
415439
fn net_v4_sendto_any() {
440+
crate::init();
441+
416442
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
417443
let addr = SocketAddr::new(localhost, 0);
418444
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -445,6 +471,8 @@ fn net_v4_sendto_any() {
445471
/// Similar, but with V6.
446472
#[test]
447473
fn net_v6_sendto_any() {
474+
crate::init();
475+
448476
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
449477
let addr = SocketAddr::new(localhost, 0);
450478
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -477,6 +505,8 @@ fn net_v6_sendto_any() {
477505
/// Test `acceptfrom`.
478506
#[test]
479507
fn net_v4_acceptfrom() {
508+
crate::init();
509+
480510
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
481511
let addr = SocketAddr::new(localhost, 0);
482512
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();
@@ -531,6 +561,8 @@ fn net_v4_acceptfrom() {
531561
/// Similar, but with V6.
532562
#[test]
533563
fn net_v6_acceptfrom() {
564+
crate::init();
565+
534566
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
535567
let addr = SocketAddr::new(localhost, 0);
536568
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::STREAM, None).unwrap();
@@ -585,6 +617,8 @@ fn net_v6_acceptfrom() {
585617
/// Test `shutdown`.
586618
#[test]
587619
fn net_shutdown() {
620+
crate::init();
621+
588622
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
589623
let addr = SocketAddr::new(localhost, 0);
590624
let listener = rustix::net::socket(AddressFamily::INET, SocketType::STREAM, None).unwrap();

‎tests/net/dgram.rs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
99
/// Test `connect_any`.
1010
#[test]
1111
fn net_dgram_v4_connect_any() {
12+
crate::init();
13+
1214
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
1315
let addr = SocketAddr::new(localhost, 0);
1416
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -38,6 +40,8 @@ fn net_dgram_v4_connect_any() {
3840
#[cfg(not(any(apple, windows, target_os = "haiku")))]
3941
#[test]
4042
fn net_dgram_v4_connect_any_accept_with() {
43+
crate::init();
44+
4145
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
4246
let addr = SocketAddr::new(localhost, 0);
4347
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -66,6 +70,8 @@ fn net_dgram_v4_connect_any_accept_with() {
6670
/// Similar, but with V6.
6771
#[test]
6872
fn net_dgram_v6_connect_any() {
73+
crate::init();
74+
6975
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
7076
let addr = SocketAddr::new(localhost, 0);
7177
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -95,6 +101,8 @@ fn net_dgram_v6_connect_any() {
95101
#[cfg(not(any(apple, windows, target_os = "haiku")))]
96102
#[test]
97103
fn net_dgram_v6_connect_any_accept_with() {
104+
crate::init();
105+
98106
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
99107
let addr = SocketAddr::new(localhost, 0);
100108
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -123,6 +131,8 @@ fn net_dgram_v6_connect_any_accept_with() {
123131
/// Test `connect` with a `SocketAddr`.
124132
#[test]
125133
fn net_dgram_v4_connect() {
134+
crate::init();
135+
126136
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
127137
let addr = SocketAddr::new(localhost, 0);
128138
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -154,6 +164,8 @@ fn net_dgram_v4_connect() {
154164
/// Similar, but use V6.
155165
#[test]
156166
fn net_dgram_v6_connect() {
167+
crate::init();
168+
157169
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
158170
let addr = SocketAddr::new(localhost, 0);
159171
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -185,6 +197,8 @@ fn net_dgram_v6_connect() {
185197
/// Test `connect_unspec`.
186198
#[test]
187199
fn net_dgram_v4_connect_unspec() {
200+
crate::init();
201+
188202
const SOME_PORT: u16 = 47;
189203
let localhost_addr = SocketAddrV4::new(Ipv4Addr::LOCALHOST, SOME_PORT);
190204

@@ -229,6 +243,8 @@ fn net_dgram_v4_connect_unspec() {
229243
/// Test `connect_unspec`.
230244
#[test]
231245
fn net_dgram_v6_connect_unspec() {
246+
crate::init();
247+
232248
const SOME_PORT: u16 = 47;
233249
let localhost_addr = SocketAddrV6::new(Ipv6Addr::LOCALHOST, SOME_PORT, 0, 0);
234250

@@ -273,6 +289,8 @@ fn net_dgram_v6_connect_unspec() {
273289
/// Test `bind_any`.
274290
#[test]
275291
fn net_dgram_v4_bind_any() {
292+
crate::init();
293+
276294
let localhost = Ipv4Addr::LOCALHOST;
277295
let addr = SocketAddrV4::new(localhost, 0).into();
278296
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -300,6 +318,8 @@ fn net_dgram_v4_bind_any() {
300318
/// Similar, but use V6.
301319
#[test]
302320
fn net_dgram_v6_bind_any() {
321+
crate::init();
322+
303323
let localhost = Ipv6Addr::LOCALHOST;
304324
let addr = SocketAddrAny::V6(SocketAddrV6::new(localhost, 0, 0, 0));
305325
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -328,6 +348,8 @@ fn net_dgram_v6_bind_any() {
328348
#[cfg(not(any(bsd, target_os = "illumos")))]
329349
#[test]
330350
fn net_dgram_v4_connect_sendto() {
351+
crate::init();
352+
331353
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
332354
let addr = SocketAddr::new(localhost, 0);
333355
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -373,6 +395,8 @@ fn net_dgram_v4_connect_sendto() {
373395
/// Test `sendto` without calling `connect`.
374396
#[test]
375397
fn net_dgram_v4_sendto() {
398+
crate::init();
399+
376400
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
377401
let addr = SocketAddr::new(localhost, 0);
378402
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -418,6 +442,8 @@ fn net_dgram_v4_sendto() {
418442
#[cfg(not(any(bsd, target_os = "illumos")))]
419443
#[test]
420444
fn net_dgram_v6_connect_sendto() {
445+
crate::init();
446+
421447
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
422448
let addr = SocketAddr::new(localhost, 0);
423449
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -463,6 +489,8 @@ fn net_dgram_v6_connect_sendto() {
463489
/// Similar, but with V6.
464490
#[test]
465491
fn net_dgram_v6_sendto() {
492+
crate::init();
493+
466494
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
467495
let addr = SocketAddr::new(localhost, 0);
468496
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -508,6 +536,8 @@ fn net_dgram_v6_sendto() {
508536
#[cfg(not(any(bsd, target_os = "illumos")))]
509537
#[test]
510538
fn net_dgram_v4_connect_sendto_any() {
539+
crate::init();
540+
511541
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
512542
let addr = SocketAddr::new(localhost, 0);
513543
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -550,6 +580,8 @@ fn net_dgram_v4_connect_sendto_any() {
550580
/// Test `sendto_any` without calling connect.
551581
#[test]
552582
fn net_dgram_v4_sendto_any() {
583+
crate::init();
584+
553585
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
554586
let addr = SocketAddr::new(localhost, 0);
555587
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -592,6 +624,8 @@ fn net_dgram_v4_sendto_any() {
592624
#[cfg(not(any(bsd, target_os = "illumos")))]
593625
#[test]
594626
fn net_dgram_v6_connect_sendto_any() {
627+
crate::init();
628+
595629
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
596630
let addr = SocketAddr::new(localhost, 0);
597631
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -634,6 +668,8 @@ fn net_dgram_v6_connect_sendto_any() {
634668
/// Similar, but with V6.
635669
#[test]
636670
fn net_dgram_v6_sendto_any() {
671+
crate::init();
672+
637673
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
638674
let addr = SocketAddr::new(localhost, 0);
639675
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();
@@ -675,6 +711,8 @@ fn net_dgram_v6_sendto_any() {
675711
/// Test `acceptfrom`.
676712
#[test]
677713
fn net_dgram_v4_acceptfrom() {
714+
crate::init();
715+
678716
let localhost = IpAddr::V4(Ipv4Addr::LOCALHOST);
679717
let addr = SocketAddr::new(localhost, 0);
680718
let listener = rustix::net::socket(AddressFamily::INET, SocketType::DGRAM, None).unwrap();
@@ -702,6 +740,8 @@ fn net_dgram_v4_acceptfrom() {
702740
/// Similar, but with V6.
703741
#[test]
704742
fn net_dgram_v6_acceptfrom() {
743+
crate::init();
744+
705745
let localhost = IpAddr::V6(Ipv6Addr::LOCALHOST);
706746
let addr = SocketAddr::new(localhost, 0);
707747
let listener = rustix::net::socket(AddressFamily::INET6, SocketType::DGRAM, None).unwrap();

‎tests/net/main.rs‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,31 @@ mod unix_alloc;
2020
mod v4;
2121
mod v6;
2222

23-
/// Windows requires us to call a setup function before using any of the
24-
/// socket APIs.
2523
#[cfg(windows)]
26-
#[ctor::ctor]
27-
fn windows_startup() {
28-
let _ = rustix::net::wsa_startup().unwrap();
24+
mod windows {
25+
use std::sync::OnceLock;
26+
27+
pub struct Thing;
28+
29+
impl Thing {
30+
pub fn new() -> Self {
31+
let _ = rustix::net::wsa_startup().unwrap();
32+
Self
33+
}
34+
}
35+
36+
impl Drop for Thing {
37+
fn drop(&mut self) {
38+
rustix::net::wsa_cleanup().unwrap();
39+
}
40+
}
41+
42+
pub static CLEANUP: OnceLock<Thing> = OnceLock::new();
2943
}
3044

31-
/// Windows requires us to call a cleanup function after using any of the
32-
/// socket APIs.
33-
#[cfg(windows)]
34-
#[ctor::dtor]
35-
fn windows_shutdown() {
36-
rustix::net::wsa_cleanup().unwrap();
45+
/// Checks whether the Windows socket interface has been started already, and
46+
/// if not, starts it.
47+
pub fn init() {
48+
#[cfg(windows)]
49+
let _ = windows::CLEANUP.get_or_init(|| windows::Thing::new());
3750
}

‎tests/net/poll.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ fn client(ready: Arc<(Mutex<u16>, Condvar)>) {
9595

9696
#[test]
9797
fn test_poll() {
98+
crate::init();
99+
98100
let ready = Arc::new((Mutex::new(0_u16), Condvar::new()));
99101
let ready_clone = Arc::clone(&ready);
100102

0 commit comments

Comments
 (0)