nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 03:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove String impls and fix for make tidy

Browse Source
This commit is contained in:
Nick Cameron 2015-01-08 14:33:57 +13:00
parent 63a9bd5e0a
commit 68a783a89f
3 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/libcore/ops.rs
View File

@ -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. /// A (half-open) range which is bounded at both ends.
#[derive(Copy, PartialEq, Eq)] #[derive(Copy, PartialEq, Eq)]
#[lang="range"] #[lang="range"]
@ -925,20 +918,6 @@ impl<Idx: fmt::Show> fmt::Show for Range<Idx> {
write!(fmt, "{:?}..{:?}", self.start, self.end) 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. /// A range which is only bounded below.
#[derive(Copy, PartialEq, Eq)] #[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. /// A range which is only bounded above.
#[derive(Copy, PartialEq, Eq)] #[derive(Copy, PartialEq, Eq)]
#[lang="range_to"] #[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 /// The `Deref` trait is used to specify the functionality of dereferencing
/// operations like `*v`. /// operations like `*v`.

3
src/libsyntax/parse/parser.rs
View File

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