From 023d49e347e9d155a8a713d40f63329902ad249d Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Wed, 28 Jan 2015 18:16:00 +1300
Subject: [PATCH] Change from core::ops::RangeFull to std::ops

---
 src/libcollections/lib.rs        | 3 ++-
 src/libcore/lib.rs               | 6 +++---
 src/libcoretest/ops.rs           | 4 ++--
 src/libstd/lib.rs                | 1 -
 src/libsyntax/parse/parser.rs    | 2 +-
 src/test/run-pass/issue-21384.rs | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 954de14a50a..82b92d26d28 100644
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -111,8 +111,9 @@ mod std {
     pub use core::option;   // necessary for panic!()
     pub use core::clone;    // derive(Clone)
     pub use core::cmp;      // derive(Eq, Ord, etc.)
-    pub use core::marker;  // derive(Copy)
+    pub use core::marker;   // derive(Copy)
     pub use core::hash;     // derive(Hash)
+    pub use core::ops;      // RangeFull
 }
 
 #[cfg(test)]
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 04cd5b2ae6a..1032c56fa22 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -147,15 +147,15 @@ mod array;
 mod core {
     pub use panicking;
     pub use fmt;
-    pub use ops;
 }
 
 #[doc(hidden)]
 mod std {
     pub use clone;
     pub use cmp;
-    pub use marker;
-    pub use option;
     pub use fmt;
     pub use hash;
+    pub use marker;
+    pub use ops;
+    pub use option;
 }
diff --git a/src/libcoretest/ops.rs b/src/libcoretest/ops.rs
index 430188c7e43..3da572f65a6 100644
--- a/src/libcoretest/ops.rs
+++ b/src/libcoretest/ops.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use test::Bencher;
-use core::ops::{Range, FullRange, RangeFrom, RangeTo};
+use core::ops::{Range, RangeFull, RangeFrom, RangeTo};
 
 // Overhead of dtors
 
@@ -64,5 +64,5 @@ fn test_range_to() {
 #[test]
 fn test_full_range() {
     // Not much to test.
-    let _ = FullRange;
+    let _ = RangeFull;
 }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 3a745389e1e..a016ba8fb0c 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -310,5 +310,4 @@ mod std {
     pub use slice;
 
     pub use boxed; // used for vec![]
-
 }
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index b9b1dd9afee..c4224db8e18 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2532,7 +2532,7 @@ impl<'a> Parser<'a> {
                     // something for RangeFull.
                     hi = self.last_span.hi;
 
-                    let idents = vec![token::str_to_ident("core"),
+                    let idents = vec![token::str_to_ident("std"),
                                       token::str_to_ident("ops"),
                                       token::str_to_ident("RangeFull")];
                     let segments = idents.into_iter().map(|ident| {
diff --git a/src/test/run-pass/issue-21384.rs b/src/test/run-pass/issue-21384.rs
index 4c8ba0dd51f..1d3984deac2 100644
--- a/src/test/run-pass/issue-21384.rs
+++ b/src/test/run-pass/issue-21384.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use ::core::ops::RangeFull;
+use ::std::ops::RangeFull;
 
 fn test<T : Clone>(arg: T) -> T {
     arg.clone()