-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #40356 from jD91mZM2/rust
rustc: 1.25.0 -> 1.26.2
- Loading branch information
Showing
8 changed files
with
140 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 0 additions & 53 deletions
53
...nt/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
104 changes: 104 additions & 0 deletions
104
pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs | ||
| index 0f60b5b3e..9b08415e7 100644 | ||
| --- a/src/libstd/net/tcp.rs | ||
| +++ b/src/libstd/net/tcp.rs | ||
| @@ -962,6 +962,7 @@ mod tests { | ||
| } | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn listen_localhost() { | ||
| let socket_addr = next_test_ip4(); | ||
| @@ -1020,6 +1021,7 @@ mod tests { | ||
| }) | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn read_eof() { | ||
| each_ip(&mut |addr| { | ||
| @@ -1039,6 +1041,7 @@ mod tests { | ||
| }) | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn write_close() { | ||
| each_ip(&mut |addr| { | ||
| @@ -1065,6 +1068,7 @@ mod tests { | ||
| }) | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn multiple_connect_serial() { | ||
| each_ip(&mut |addr| { | ||
| @@ -1087,6 +1091,7 @@ mod tests { | ||
| }) | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn multiple_connect_interleaved_greedy_schedule() { | ||
| const MAX: usize = 10; | ||
| @@ -1123,6 +1128,7 @@ mod tests { | ||
| } | ||
|
|
||
| #[test] | ||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| fn multiple_connect_interleaved_lazy_schedule() { | ||
| const MAX: usize = 10; | ||
| each_ip(&mut |addr| { | ||
| @@ -1401,6 +1407,7 @@ mod tests { | ||
| } | ||
|
|
||
| #[test] | ||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| fn clone_while_reading() { | ||
| each_ip(&mut |addr| { | ||
| let accept = t!(TcpListener::bind(&addr)); | ||
| @@ -1421,7 +1422,10 @@ mod tests { | ||
|
|
||
| // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code | ||
| // no longer has rounding errors. | ||
| - #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] | ||
| + #[cfg_attr(any(target_os = "bitrig", | ||
| + target_os = "netbsd", | ||
| + target_os = "openbsd", | ||
| + target_os = "macos"), ignore)] | ||
| #[test] | ||
| fn timeouts() { | ||
| let addr = next_test_ip4(); | ||
| @@ -1596,6 +1603,7 @@ mod tests { | ||
| drop(listener); | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn nodelay() { | ||
| let addr = next_test_ip4(); | ||
| @@ -1610,6 +1618,7 @@ mod tests { | ||
| assert_eq!(false, t!(stream.nodelay())); | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn ttl() { | ||
| let ttl = 100; | ||
| @@ -1647,6 +1656,7 @@ mod tests { | ||
| } | ||
| } | ||
|
|
||
| + #[cfg_attr(target_os = "macos", ignore)] | ||
| #[test] | ||
| fn peek() { | ||
| each_ip(&mut |addr| { | ||
| @@ -1679,6 +1689,7 @@ mod tests { | ||
| } | ||
|
|
||
| #[test] | ||
| + #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)] | ||
| fn connect_timeout_unroutable() { | ||
| // this IP is unroutable, so connections should always time out, | ||
| // provided the network is reachable to begin with. |
20 changes: 20 additions & 0 deletions
20
pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs | ||
| index 32915c332..7cb54f31e 100644 | ||
| --- a/src/stdsimd/coresimd/x86/mod.rs | ||
| +++ b/src/stdsimd/coresimd/x86/mod.rs | ||
| @@ -279,7 +279,6 @@ types! { | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| - /// ``` | ||
| /// # #![feature(cfg_target_feature, target_feature, stdsimd)] | ||
| /// # #![cfg_attr(not(dox), no_std)] | ||
| /// # #[cfg(not(dox))] | ||
| @@ -301,7 +300,6 @@ types! { | ||
| /// # } | ||
| /// # if is_x86_feature_detected!("sse") { unsafe { foo() } } | ||
| /// # } | ||
| - /// ``` | ||
| pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32); | ||
|
|
||
| /// 256-bit wide set of four `f64` types, x86-specific |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters