---

yaml
---
r: 182898
b: refs/heads/beta
c: 023d49e
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: bf2b4738163b196685198e91d7ce4e2761bb718e
+refs/heads/beta: 023d49e347e9d155a8a713d40f63329902ad249d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/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)]

branches/beta/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;
 }

branches/beta/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;
 }

branches/beta/src/libstd/lib.rs

@@ -310,5 +310,4 @@ mod std {
     pub use slice;
 
     pub use boxed; // used for vec![]
-
 }

branches/beta/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| {

branches/beta/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()