Skip to content

Commit a65a777

Browse files
committed
Rust upgrade to rustc 1.7.0-nightly (8ad12c3 2015-12-19)
1 parent 9dca15d commit a65a777

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "clippy"
3-
version = "0.0.30"
3+
version = "0.0.31"
44
authors = [
55
"Manish Goregaokar <[email protected]>",
66
"Andre Bogus <[email protected]>",

src/consts.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ use syntax::ast::Lit_;
2020
use syntax::ast::LitIntType::*;
2121
use syntax::ast::LitIntType;
2222
use syntax::ast::{UintTy, FloatTy, StrStyle};
23-
use syntax::ast::UintTy::*;
2423
use syntax::ast::FloatTy::*;
2524
use syntax::ast::Sign::{self, Plus, Minus};
26-
use syntax::ast_util;
2725

2826

2927
#[derive(PartialEq, Eq, Debug, Copy, Clone)]
@@ -195,9 +193,9 @@ impl fmt::Display for Constant {
195193
let (sign, suffix) = match *ity {
196194
LitIntType::SignedIntLit(ref sity, ref sign) =>
197195
(if let Sign::Minus = *sign { "-" } else { "" },
198-
ast_util::int_ty_to_string(*sity)),
196+
sity.ty_to_string()),
199197
LitIntType::UnsignedIntLit(ref uity) =>
200-
("", ast_util::uint_ty_to_string(*uity)),
198+
("", uity.ty_to_string()),
201199
LitIntType::UnsuffixedIntLit(ref sign) =>
202200
(if let Sign::Minus = *sign { "-" } else { "" },
203201
"".into()),

src/precedence.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use rustc::lint::*;
22
use syntax::codemap::Spanned;
33
use syntax::ast::*;
4-
use syntax::ast_util::binop_to_string;
54

65
use utils::{span_lint, snippet};
76

@@ -38,17 +37,17 @@ impl EarlyLintPass for Precedence {
3837
&format!("operator precedence can trip the unwary. \
3938
Consider parenthesizing your expression:\
4039
`({}) {} ({})`", snippet(cx, left.span, ".."),
41-
binop_to_string(op), snippet(cx, right.span, ".."))),
40+
op.to_string(), snippet(cx, right.span, ".."))),
4241
(true, false) => span_lint(cx, PRECEDENCE, expr.span,
4342
&format!("operator precedence can trip the unwary. \
4443
Consider parenthesizing your expression:\
4544
`({}) {} {}`", snippet(cx, left.span, ".."),
46-
binop_to_string(op), snippet(cx, right.span, ".."))),
45+
op.to_string(), snippet(cx, right.span, ".."))),
4746
(false, true) => span_lint(cx, PRECEDENCE, expr.span,
4847
&format!("operator precedence can trip the unwary. \
4948
Consider parenthesizing your expression:\
5049
`{} {} ({})`", snippet(cx, left.span, ".."),
51-
binop_to_string(op), snippet(cx, right.span, ".."))),
50+
op.to_string(), snippet(cx, right.span, ".."))),
5251
_ => (),
5352
}
5453
}

0 commit comments

Comments
 (0)