Skip to content

Commit 023d49e

Browse files
committed
Change from core::ops::RangeFull to std::ops
1 parent bf2b473 commit 023d49e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/libcollections/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ mod std {
111111
pub use core::option; // necessary for panic!()
112112
pub use core::clone; // derive(Clone)
113113
pub use core::cmp; // derive(Eq, Ord, etc.)
114-
pub use core::marker; // derive(Copy)
114+
pub use core::marker; // derive(Copy)
115115
pub use core::hash; // derive(Hash)
116+
pub use core::ops; // RangeFull
116117
}
117118

118119
#[cfg(test)]

src/libcore/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ mod array;
147147
mod core {
148148
pub use panicking;
149149
pub use fmt;
150-
pub use ops;
151150
}
152151

153152
#[doc(hidden)]
154153
mod std {
155154
pub use clone;
156155
pub use cmp;
157-
pub use marker;
158-
pub use option;
159156
pub use fmt;
160157
pub use hash;
158+
pub use marker;
159+
pub use ops;
160+
pub use option;
161161
}

src/libcoretest/ops.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use test::Bencher;
12-
use core::ops::{Range, FullRange, RangeFrom, RangeTo};
12+
use core::ops::{Range, RangeFull, RangeFrom, RangeTo};
1313

1414
// Overhead of dtors
1515

@@ -64,5 +64,5 @@ fn test_range_to() {
6464
#[test]
6565
fn test_full_range() {
6666
// Not much to test.
67-
let _ = FullRange;
67+
let _ = RangeFull;
6868
}

src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -310,5 +310,4 @@ mod std {
310310
pub use slice;
311311

312312
pub use boxed; // used for vec![]
313-
314313
}

src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2532,7 +2532,7 @@ impl<'a> Parser<'a> {
25322532
// something for RangeFull.
25332533
hi = self.last_span.hi;
25342534

2535-
let idents = vec![token::str_to_ident("core"),
2535+
let idents = vec![token::str_to_ident("std"),
25362536
token::str_to_ident("ops"),
25372537
token::str_to_ident("RangeFull")];
25382538
let segments = idents.into_iter().map(|ident| {

src/test/run-pass/issue-21384.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use ::core::ops::RangeFull;
11+
use ::std::ops::RangeFull;
1212

1313
fn test<T : Clone>(arg: T) -> T {
1414
arg.clone()

0 commit comments

Comments
 (0)