diff options
| author | bors <bors@rust-lang.org> | 2022-09-21 17:17:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-21 17:17:25 +0000 |
| commit | db4b4d3becf257e7b1c051540fc7e317958d8d2d (patch) | |
| tree | e6f8cb29b3451534219932f7d7dbd1d1c035ee1e /library/alloc/src | |
| parent | b79b7d8b4e0f2b112142a9ce1fea335f321a6558 (diff) | |
| parent | 39bb2a79884b9e4813e2875de0910790d968f6c1 (diff) | |
| download | rust-db4b4d3becf257e7b1c051540fc7e317958d8d2d.tar.gz rust-db4b4d3becf257e7b1c051540fc7e317958d8d2d.zip | |
Auto merge of #102097 - Dylan-DPC:rollup-gc75oh4, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #89891 (`alloc`: add unstable cfg features `no_rc` and `no_sync`) - #101995 (Add another example for `uN::carrying_mul`) - #102031 (Adding ignore fuchsia tests for Backtrace, ErrorKind cases) - #102041 (Improve `-Zmeta-stats` some more) - #102045 (fix ConstProp handling of written_only_inside_own_block_locals) - #102058 (Clarify Path::extension() semantics in docs abstract) - #102059 (Use rebind instead of dummy binder in `SameTypeModuloInfer` relation) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/lib.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index ce71cd600fc..6b3b1c22222 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -69,6 +69,8 @@ any(not(feature = "miri-test-libstd"), test, doctest), no_global_oom_handling, not(no_global_oom_handling), + not(no_rc), + not(no_sync), target_has_atomic = "ptr" ))] #![no_std] @@ -225,16 +227,17 @@ mod boxed { } pub mod borrow; pub mod collections; -#[cfg(not(no_global_oom_handling))] +#[cfg(all(not(no_rc), not(no_sync), not(no_global_oom_handling)))] pub mod ffi; pub mod fmt; +#[cfg(not(no_rc))] pub mod rc; pub mod slice; pub mod str; pub mod string; -#[cfg(target_has_atomic = "ptr")] +#[cfg(all(not(no_rc), not(no_sync), target_has_atomic = "ptr"))] pub mod sync; -#[cfg(all(not(no_global_oom_handling), target_has_atomic = "ptr"))] +#[cfg(all(not(no_global_oom_handling), not(no_rc), not(no_sync), target_has_atomic = "ptr"))] pub mod task; #[cfg(test)] mod tests; |