diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-01-08 14:33:57 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-01-08 14:35:53 +1300 |
| commit | 68a783a89f4c7e74d4c7e09bfac67283e054d4fc (patch) | |
| tree | 8abe19476d93300b0bbf22fdf77581129df54881 | |
| parent | 63a9bd5e0adc03652e10506055564077aa00eeaa (diff) | |
| download | rust-68a783a89f4c7e74d4c7e09bfac67283e054d4fc.tar.gz rust-68a783a89f4c7e74d4c7e09bfac67283e054d4fc.zip | |
Remove String impls and fix for make tidy
| -rw-r--r-- | src/libcore/ops.rs | 51 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/ranges-precedence.rs | 2 |
3 files changed, 1 insertions, 55 deletions
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 8d86252e051..ab956587d82 100644 --- a/src/libcore/ops.rs +++ b/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`. diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d70f4e74b5f..ab4e39bd767 100644 --- a/src/libsyntax/parse/parser.rs +++ b/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 { diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/run-pass/ranges-precedence.rs index ea72eb38865..f678eed8775 100644 --- a/src/test/run-pass/ranges-precedence.rs +++ b/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)); |
