---

yaml
---
r: 171585
b: refs/heads/batch
c: 68a783a
h: refs/heads/master
i:
  171583: f109b84
v: v3

Author: nrc

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 63a9bd5e0adc03652e10506055564077aa00eeaa
+refs/heads/batch: 68a783a89f4c7e74d4c7e09bfac67283e054d4fc
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libcore/ops.rs

@@ -860,13 +860,6 @@ impl fmt::Show for FullRange {
     }
 }
 
-#[unstable = "API still in development"]
-impl fmt::String for FullRange {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt::String::fmt("..", fmt)
-    }
-}
-
 /// A (half-open) range which is bounded at both ends.
 #[derive(Copy, PartialEq, Eq)]
 #[lang="range"]
@@ -925,20 +918,6 @@ impl<Idx: fmt::Show> fmt::Show for Range<Idx> {
         write!(fmt, "{:?}..{:?}", self.start, self.end)
     }
 }
-#[cfg(stage0)]
-#[unstable = "API still in development"]
-impl<Idx: fmt::String + fmt::Show> fmt::String for Range<Idx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{}..{}", self.start, self.end)
-    }
-}
-#[cfg(not(stage0))]
-#[unstable = "API still in development"]
-impl<Idx: fmt::String> fmt::String for Range<Idx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{}..{}", self.start, self.end)
-    }
-}
 
 /// A range which is only bounded below.
 #[derive(Copy, PartialEq, Eq)]
@@ -969,21 +948,6 @@ impl<Idx: fmt::Show> fmt::Show for RangeFrom<Idx> {
     }
 }
 
-#[cfg(stage0)]
-#[unstable = "API still in development"]
-impl<Idx: fmt::String + fmt::Show> fmt::String for RangeFrom<Idx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{}..", self.start)
-    }
-}
-#[cfg(not(stage0))]
-#[unstable = "API still in development"]
-impl<Idx: fmt::String> fmt::String for RangeFrom<Idx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{}..", self.start)
-    }
-}
-
 /// A range which is only bounded above.
 #[derive(Copy, PartialEq, Eq)]
 #[lang="range_to"]
@@ -1000,21 +964,6 @@ impl<Idx: fmt::Show> fmt::Show for RangeTo<Idx> {
     }
 }
 
-#[cfg(stage0)]
-#[unstable = "API still in development"]
-impl<Idx: fmt::String + fmt::Show> fmt::String for RangeTo<Idx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "..{}", self.end)
-    }
-}
-#[cfg(not(stage0))]
-#[unstable = "API still in development"]
-impl<Idx: fmt::String> fmt::String for RangeTo<Idx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "..{}", self.end)
-    }
-}
-
 
 /// The `Deref` trait is used to specify the functionality of dereferencing
 /// operations like `*v`.

branches/batch/src/libsyntax/parse/parser.rs

@@ -2894,7 +2894,6 @@ impl<'a> Parser<'a> {
                 let cur_prec = operator_prec(cur_op);
                 if cur_prec > min_prec {
                     self.bump();
-                    // TODO
                     let expr = self.parse_prefix_expr();
                     let rhs = self.parse_more_binops(expr, cur_prec);
                     let lhs_span = lhs.span;
@@ -2956,13 +2955,11 @@ impl<'a> Parser<'a> {
               let assign_op = self.mk_assign_op(aop, lhs, rhs);
               self.mk_expr(span.lo, rhs_span.hi, assign_op)
           }
-          // TODO
           // A range expression, either `expr..expr` or `expr..`.
           token::DotDot if !self.restrictions.contains(RESTRICTION_NO_DOTS) => {
             self.bump();
 
             let opt_end = if self.token.can_begin_expr() {
-                // TODO only use of RES...DOT
                 let end = self.parse_expr_res(RESTRICTION_NO_DOTS);
                 Some(end)
             } else {

branches/batch/src/test/run-pass/ranges-precedence.rs

@@ -29,7 +29,7 @@ fn main() {
 
     let x = 1+3..4;
     assert!(x == (4..4));
-    
+
     let a = Foo { foo: 3 };
     let x = a.foo..a.bar();
     assert!(x == (3..5));