diff options
| author | bors <bors@rust-lang.org> | 2023-06-16 11:51:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-16 11:51:43 +0000 |
| commit | 2304917aad2f18ee9a1c6969e1197c96dee907b6 (patch) | |
| tree | 2f11e8ea2652f15c434a88175a472b459b63eddf /library/std/src | |
| parent | 99b334696fffe8c08d2e6a978862849d5a89f875 (diff) | |
| parent | c2e109744db3322f44ebfbe707847bbb9b9be933 (diff) | |
| download | rust-2304917aad2f18ee9a1c6969e1197c96dee907b6.tar.gz rust-2304917aad2f18ee9a1c6969e1197c96dee907b6.zip | |
Auto merge of #112702 - Dylan-DPC:rollup-12d6qay, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #112163 (fix: inline `predicate_may_hold_fatal` and remove expect call in it) - #112399 (Instantiate closure synthetic substs in root universe) - #112443 (Opportunistically resolve regions in new solver) - #112535 (reorder attributes to make miri-test-libstd work again) - #112579 (Fix building libstd documentation on FreeBSD.) - #112639 (Fix `dead_code_cgu` computation) - #112642 (Handle interpolated literal errors) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 13 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/ancillary.rs | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index d53f1a2b2ff..da08c018d0e 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -188,6 +188,13 @@ //! [array]: prim@array //! [slice]: prim@slice +// To run std tests without x.py without ending up with two copies of std, Miri needs to be +// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>. +// rustc itself never sets the feature, so this line has no affect there. +#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))] +// miri-test-libstd also prefers to make std use the sysroot versions of the dependencies. +#![cfg_attr(feature = "miri-test-libstd", feature(rustc_private))] +// #![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))] #![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))] #![doc( @@ -202,12 +209,6 @@ no_global_oom_handling, not(no_global_oom_handling) ))] -// To run std tests without x.py without ending up with two copies of std, Miri needs to be -// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>. -// rustc itself never sets the feature, so this line has no affect there. -#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))] -// miri-test-libstd also prefers to make std use the sysroot versions of the dependencies. -#![cfg_attr(feature = "miri-test-libstd", feature(rustc_private))] // Don't link to std. We are std. #![no_std] // Tell the compiler to link to either panic_abort or panic_unwind diff --git a/library/std/src/os/unix/net/ancillary.rs b/library/std/src/os/unix/net/ancillary.rs index 7565fbc0d09..814f1c7c283 100644 --- a/library/std/src/os/unix/net/ancillary.rs +++ b/library/std/src/os/unix/net/ancillary.rs @@ -17,6 +17,7 @@ mod libc { pub use libc::c_int; pub struct ucred; pub struct cmsghdr; + pub struct sockcred2; pub type pid_t = i32; pub type gid_t = u32; pub type uid_t = u32; |