Skip to content

Commit eaf71f8

Browse files
authored
Auto merge of #35906 - jseyfried:local_prelude, r=eddyb
Use `#[prelude_import]` in `libcore` and `libstd` r? @eddyb
2 parents e07dd59 + a9a2979 commit eaf71f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+43
-403
lines changed

src/libcollections/binary_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
#![allow(missing_docs)]
152152
#![stable(feature = "rust1", since = "1.0.0")]
153153

154-
use core::ops::{Drop, Deref, DerefMut};
154+
use core::ops::{Deref, DerefMut};
155155
use core::iter::{FromIterator, FusedIterator};
156156
use core::mem::swap;
157157
use core::mem::size_of;

src/libcollections/borrow.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@
1212
1313
#![stable(feature = "rust1", since = "1.0.0")]
1414

15-
use core::clone::Clone;
16-
use core::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd};
17-
use core::convert::AsRef;
18-
use core::default::Default;
15+
use core::cmp::Ordering;
1916
use core::hash::{Hash, Hasher};
20-
use core::marker::Sized;
2117
use core::ops::Deref;
22-
use core::option::Option;
2318

2419
use fmt;
2520

src/libcollections/linked_list.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,9 +1159,6 @@ unsafe impl<'a, T: Sync> Sync for IterMut<'a, T> {}
11591159

11601160
#[cfg(test)]
11611161
mod tests {
1162-
use std::clone::Clone;
1163-
use std::iter::{Iterator, IntoIterator, Extend};
1164-
use std::option::Option::{self, Some, None};
11651162
use std::__rand::{thread_rng, Rng};
11661163
use std::thread;
11671164
use std::vec::Vec;
@@ -1319,7 +1316,6 @@ mod tests {
13191316

13201317
#[test]
13211318
fn test_26021() {
1322-
use std::iter::ExactSizeIterator;
13231319
// There was a bug in split_off that failed to null out the RHS's head's prev ptr.
13241320
// This caused the RHS's dtor to walk up into the LHS at drop and delete all of
13251321
// its nodes.

src/libcollections/range.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
//! Range syntax.
1616
17-
use core::option::Option::{self, None, Some};
1817
use core::ops::{RangeFull, Range, RangeTo, RangeFrom};
1918

2019
/// **RangeArgument** is implemented by Rust's built-in range types, produced

src/libcollections/vec_deque.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,9 +2332,6 @@ impl<T> From<VecDeque<T>> for Vec<T> {
23322332

23332333
#[cfg(test)]
23342334
mod tests {
2335-
use core::iter::Iterator;
2336-
use core::option::Option::Some;
2337-
23382335
use test;
23392336

23402337
use super::VecDeque;

src/libcore/any.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@
7272
#![stable(feature = "rust1", since = "1.0.0")]
7373

7474
use fmt;
75-
use marker::Send;
7675
use mem::transmute;
77-
use option::Option::{self, Some, None};
7876
use raw::TraitObject;
7977
use intrinsics;
80-
use marker::{Reflect, Sized};
78+
use marker::Reflect;
8179

8280
///////////////////////////////////////////////////////////////////////////////
8381
// Any trait

src/libcore/array.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@
2020
issue = "27778")]
2121

2222
use borrow::{Borrow, BorrowMut};
23-
use clone::Clone;
24-
use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
25-
use convert::{AsRef, AsMut};
26-
use default::Default;
23+
use cmp::Ordering;
2724
use fmt;
2825
use hash::{Hash, self};
29-
use iter::IntoIterator;
30-
use marker::{Copy, Sized, Unsize};
31-
use option::Option;
32-
use slice::{Iter, IterMut, SliceExt};
26+
use marker::Unsize;
27+
use slice::{Iter, IterMut};
3328

3429
/// Utility trait implemented only on arrays of fixed size
3530
///

src/libcore/borrow.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
1313
#![stable(feature = "rust1", since = "1.0.0")]
1414

15-
use marker::Sized;
16-
1715
/// A trait for borrowing data.
1816
///
1917
/// In general, there may be several ways to "borrow" a piece of data. The

src/libcore/cell.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,10 @@
144144
145145
#![stable(feature = "rust1", since = "1.0.0")]
146146

147-
use clone::Clone;
148-
use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
149-
use convert::From;
150-
use default::Default;
147+
use cmp::Ordering;
151148
use fmt::{self, Debug, Display};
152-
use marker::{Copy, PhantomData, Send, Sync, Sized, Unsize};
153-
use ops::{Deref, DerefMut, Drop, FnOnce, CoerceUnsized};
154-
use option::Option;
155-
use option::Option::{None, Some};
156-
use result::Result;
157-
use result::Result::{Ok, Err};
149+
use marker::{PhantomData, Unsize};
150+
use ops::{Deref, DerefMut, CoerceUnsized};
158151

159152
/// A mutable memory location that admits only `Copy` data.
160153
///

src/libcore/char.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#![allow(non_snake_case)]
1616
#![stable(feature = "core_char", since = "1.2.0")]
1717

18-
use prelude::v1::*;
19-
2018
use char_private::is_printable;
2119
use iter::FusedIterator;
2220
use mem::transmute;

0 commit comments

Comments
 (0)