diff options
| author | bors <bors@rust-lang.org> | 2021-01-19 12:04:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-19 12:04:22 +0000 |
| commit | f09fb488f70c5965ec4f64453a6e681fbfcff56c (patch) | |
| tree | d31d1870ef32e0e3ee3ccb777ba9aa956a313591 /library/alloc/src/lib.rs | |
| parent | 47121d6d884bb60dad47e345f52f2ad6aadecaaf (diff) | |
| parent | dcb74796c0a644bc78fdadbfb2b8df0d9e9d9359 (diff) | |
| download | rust-f09fb488f70c5965ec4f64453a6e681fbfcff56c.tar.gz rust-f09fb488f70c5965ec4f64453a6e681fbfcff56c.zip | |
Auto merge of #81186 - GuillaumeGomez:rollup-y2d04g9, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #80382 (Improve search result tab handling) - #81112 (Remove unused alloc::std::ops re-export.) - #81115 (BTreeMap: prefer bulk_steal functions over specialized ones) - #81147 (Fix structured suggestion for explicit `drop` call) - #81161 (Remove inline script tags) - #81164 (Fix typo in simplify.rs) - #81166 (remove some outdated comments regarding debug assertions) - #81168 (Fixes #81109 - Typo in pointer::wrapping_sub) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src/lib.rs')
| -rw-r--r-- | library/alloc/src/lib.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 14a10aac061..8d721ed7487 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -185,11 +185,6 @@ pub mod task; mod tests; pub mod vec; -#[cfg(not(test))] -mod std { - pub use core::ops; // RangeFull -} - #[doc(hidden)] #[unstable(feature = "liballoc_internals", issue = "none", reason = "implementation detail")] pub mod __export { |