Skip to content

Commit e234961

Browse files
mcartonmcarton
committed
Rustup to 1.9.0-nightly (bf5da36 2016-04-06)
1 parent c1c935d commit e234961

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+134
-128
lines changed

Diff for: ‎src/approx_const.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc::lint::*;
2-
use rustc_front::hir::*;
2+
use rustc::hir::*;
33
use std::f64::consts as f64;
44
use syntax::ast::{Lit, LitKind, FloatTy};
55
use utils::span_lint;

Diff for: ‎src/array_indexing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc::ty::TyArray;
44
use rustc_const_eval::EvalHint::ExprTypeChecked;
55
use rustc_const_eval::eval_const_expr_partial;
66
use rustc_const_math::ConstInt;
7-
use rustc_front::hir::*;
7+
use rustc::hir::*;
88
use syntax::ast::RangeLimits;
99
use utils;
1010

Diff for: ‎src/attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use reexport::*;
44
use rustc::lint::*;
5-
use rustc_front::hir::*;
5+
use rustc::hir::*;
66
use semver::Version;
77
use syntax::ast::{Attribute, Lit, LitKind, MetaItemKind};
88
use syntax::attr::*;

Diff for: ‎src/bit_mask.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
use rustc::hir::*;
2+
use rustc::hir::def::{Def, PathResolution};
13
use rustc::lint::*;
2-
use rustc::middle::def::{Def, PathResolution};
34
use rustc_const_eval::lookup_const_by_id;
4-
use rustc_front::hir::*;
5-
use rustc_front::util::is_comparison_binop;
65
use syntax::ast::LitKind;
76
use syntax::codemap::Span;
87
use utils::span_lint;
@@ -91,7 +90,7 @@ impl LintPass for BitMask {
9190
impl LateLintPass for BitMask {
9291
fn check_expr(&mut self, cx: &LateContext, e: &Expr) {
9392
if let ExprBinary(ref cmp, ref left, ref right) = e.node {
94-
if is_comparison_binop(cmp.node) {
93+
if cmp.node.is_comparison() {
9594
fetch_int_literal(cx, right).map_or_else(|| {
9695
fetch_int_literal(cx, left).map_or((), |cmp_val| {
9796
check_compare(cx,

Diff for: ‎src/blacklisted_name.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc::lint::*;
2-
use rustc_front::hir::*;
2+
use rustc::hir::*;
33
use utils::span_lint;
44

55
/// **What it does:** This lints about usage of blacklisted names.

Diff for: ‎src/block_in_if_condition.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::{LateLintPass, LateContext, LintArray, LintPass};
2-
use rustc_front::hir::*;
3-
use rustc_front::intravisit::{Visitor, walk_expr};
2+
use rustc::hir::*;
3+
use rustc::hir::intravisit::{Visitor, walk_expr};
44
use utils::*;
55

66
/// **What it does:** This lint checks for `if` conditions that use blocks to contain an expression.

Diff for: ‎src/booleans.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::{LintArray, LateLintPass, LateContext, LintPass};
2-
use rustc_front::hir::*;
3-
use rustc_front::intravisit::*;
2+
use rustc::hir::*;
3+
use rustc::hir::intravisit::*;
44
use syntax::ast::{LitKind, DUMMY_NODE_ID};
55
use syntax::codemap::{DUMMY_SP, dummy_spanned};
66
use utils::{span_lint_and_then, in_macro, snippet_opt, SpanlessEq};

Diff for: ‎src/collapsible_if.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! This lint is **warn** by default
1414
1515
use rustc::lint::*;
16-
use rustc_front::hir::*;
16+
use rustc::hir::*;
1717
use std::borrow::Cow;
1818
use syntax::codemap::Spanned;
1919

Diff for: ‎src/consts.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#![allow(cast_possible_truncation)]
22

33
use rustc::lint::LateContext;
4-
use rustc::middle::def::{Def, PathResolution};
4+
use rustc::hir::def::{Def, PathResolution};
55
use rustc_const_eval::lookup_const_by_id;
66
use rustc_const_math::{ConstInt, ConstUsize, ConstIsize};
7-
use rustc_front::hir::*;
7+
use rustc::hir::*;
88
use std::cmp::Ordering::{self, Equal};
99
use std::cmp::PartialOrd;
1010
use std::hash::{Hash, Hasher};

Diff for: ‎src/copies.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::*;
22
use rustc::ty;
3-
use rustc_front::hir::*;
3+
use rustc::hir::*;
44
use std::collections::HashMap;
55
use std::collections::hash_map::Entry;
66
use syntax::parse::token::InternedString;

Diff for: ‎src/cyclomatic_complexity.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use rustc::lint::*;
44
use rustc::cfg::CFG;
55
use rustc::ty;
6-
use rustc_front::hir::*;
7-
use rustc_front::intravisit::{Visitor, walk_expr};
6+
use rustc::hir::*;
7+
use rustc::hir::intravisit::{Visitor, walk_expr};
88
use syntax::ast::Attribute;
99
use syntax::attr::*;
1010
use syntax::codemap::Span;

Diff for: ‎src/derive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc::ty::subst::Subst;
33
use rustc::ty::TypeVariants;
44
use rustc::ty::fast_reject::simplify_type;
55
use rustc::ty;
6-
use rustc_front::hir::*;
6+
use rustc::hir::*;
77
use syntax::ast::{Attribute, MetaItemKind};
88
use syntax::codemap::Span;
99
use utils::{CLONE_TRAIT_PATH, HASH_PATH};

Diff for: ‎src/drop_ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::*;
22
use rustc::ty;
3-
use rustc_front::hir::*;
3+
use rustc::hir::*;
44
use syntax::codemap::Span;
55
use utils::DROP_PATH;
66
use utils::{match_def_path, span_note_and_lint};

Diff for: ‎src/entry.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::*;
2-
use rustc_front::hir::*;
3-
use rustc_front::intravisit::{Visitor, walk_expr, walk_block};
2+
use rustc::hir::*;
3+
use rustc::hir::intravisit::{Visitor, walk_expr, walk_block};
44
use syntax::codemap::Span;
55
use utils::SpanlessEq;
66
use utils::{BTREEMAP_PATH, HASHMAP_PATH};

Diff for: ‎src/enum_clike.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use rustc::lint::*;
44
use rustc::middle::const_val::ConstVal;
55
use rustc_const_math::*;
6-
use rustc_front::hir::*;
6+
use rustc::hir::*;
77
use syntax::attr::*;
88
use utils::span_lint;
99

Diff for: ‎src/enum_glob_use.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! lint on `use`ing all variants of an enum
22
3-
use rustc::front::map::Node::NodeItem;
3+
use rustc::hir::*;
4+
use rustc::hir::def::Def;
5+
use rustc::hir::map::Node::NodeItem;
46
use rustc::lint::{LateLintPass, LintPass, LateContext, LintArray, LintContext};
5-
use rustc::middle::def::Def;
67
use rustc::middle::cstore::DefLike;
7-
use rustc_front::hir::*;
88
use syntax::ast::NodeId;
99
use syntax::codemap::Span;
1010
use utils::span_lint;

Diff for: ‎src/eq_op.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use rustc::hir::*;
12
use rustc::lint::*;
2-
use rustc_front::hir::*;
3-
use rustc_front::util as ast_util;
43
use utils::{SpanlessEq, span_lint};
54

65
/// **What it does:** This lint checks for equal operands to comparison, logical and bitwise,
@@ -34,7 +33,7 @@ impl LateLintPass for EqOp {
3433
span_lint(cx,
3534
EQ_OP,
3635
e.span,
37-
&format!("equal expressions as operands to `{}`", ast_util::binop_to_string(op.node)));
36+
&format!("equal expressions as operands to `{}`", op.node.as_str()));
3837
}
3938
}
4039
}

Diff for: ‎src/escape.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
use rustc::front::map::Node::{NodeExpr, NodeStmt};
1+
use rustc::hir::*;
2+
use rustc::hir::intravisit as visit;
3+
use rustc::hir::map::Node::{NodeExpr, NodeStmt};
4+
use rustc::infer;
25
use rustc::lint::*;
36
use rustc::middle::expr_use_visitor::*;
4-
use rustc::infer;
57
use rustc::middle::mem_categorization::{cmt, Categorization};
68
use rustc::traits::ProjectionMode;
79
use rustc::ty::adjustment::AutoAdjustment;
810
use rustc::ty;
911
use rustc::util::nodemap::NodeSet;
10-
use rustc_front::hir::*;
11-
use rustc_front::intravisit as visit;
1212
use syntax::ast::NodeId;
1313
use syntax::codemap::Span;
1414
use utils::span_lint;

Diff for: ‎src/eta_reduction.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::*;
22
use rustc::ty;
3-
use rustc_front::hir::*;
3+
use rustc::hir::*;
44
use utils::{snippet_opt, span_lint_and_then, is_adjusted};
55

66
#[allow(missing_copy_implementations)]

Diff for: ‎src/format.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use rustc::front::map::Node::NodeItem;
1+
use rustc::hir::map::Node::NodeItem;
22
use rustc::lint::*;
33
use rustc::ty::TypeVariants;
4-
use rustc_front::hir::*;
4+
use rustc::hir::*;
55
use syntax::ast::LitKind;
66
use utils::{DISPLAY_FMT_METHOD_PATH, FMT_ARGUMENTS_NEWV1_PATH, STRING_PATH};
77
use utils::{is_expn_of, match_path, match_type, span_lint, walk_ptrs_ty};

Diff for: ‎src/functions.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::*;
2-
use rustc_front::hir;
3-
use rustc_front::intravisit;
2+
use rustc::hir;
3+
use rustc::hir::intravisit;
44
use syntax::ast;
55
use syntax::codemap::Span;
66
use utils::span_lint;
@@ -45,7 +45,7 @@ impl LintPass for Functions {
4545

4646
impl LateLintPass for Functions {
4747
fn check_fn(&mut self, cx: &LateContext, _: intravisit::FnKind, decl: &hir::FnDecl, _: &hir::Block, span: Span, nodeid: ast::NodeId) {
48-
use rustc::front::map::Node::*;
48+
use rustc::hir::map::Node::*;
4949

5050
if let Some(NodeItem(ref item)) = cx.tcx.map.find(cx.tcx.map.get_parent_node(nodeid)) {
5151
match item.node {

Diff for: ‎src/identity_op.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use consts::{constant_simple, Constant};
22
use rustc::lint::*;
3-
use rustc_front::hir::*;
3+
use rustc::hir::*;
44
use syntax::codemap::Span;
55
use utils::{span_lint, snippet, in_macro};
66
use rustc_const_math::ConstInt;

Diff for: ‎src/len_zero.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc::lint::*;
2-
use rustc::middle::def_id::DefId;
2+
use rustc::hir::def_id::DefId;
33
use rustc::ty::{self, MethodTraitItemId, ImplOrTraitItemId};
4-
use rustc_front::hir::*;
4+
use rustc::hir::*;
55
use syntax::ast::{Lit, LitKind, Name};
66
use syntax::codemap::{Span, Spanned};
77
use syntax::ptr::P;
@@ -111,6 +111,8 @@ fn check_impl_items(cx: &LateContext, item: &Item, impl_items: &[ImplItem]) {
111111
if !impl_items.iter().any(|i| is_named_self(i, "is_empty")) {
112112
for i in impl_items {
113113
if is_named_self(i, "len") {
114+
let ty = cx.tcx.node_id_to_type(item.id);
115+
114116
let s = i.span;
115117
span_lint(cx,
116118
LEN_WITHOUT_IS_EMPTY,
@@ -121,7 +123,7 @@ fn check_impl_items(cx: &LateContext, item: &Item, impl_items: &[ImplItem]) {
121123
},
122124
&format!("item `{}` has a `.len(_: &Self)` method, but no `.is_empty(_: &Self)` method. \
123125
Consider adding one",
124-
item.name));
126+
ty));
125127
return;
126128
}
127129
}

Diff for: ‎src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ fn main() {
1919
extern crate syntax;
2020
#[macro_use]
2121
extern crate rustc;
22-
#[macro_use]
23-
extern crate rustc_front;
2422

2523
extern crate toml;
2624

Diff for: ‎src/lifetimes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use reexport::*;
22
use rustc::lint::*;
3-
use rustc::middle::def::Def;
4-
use rustc_front::hir::*;
5-
use rustc_front::intravisit::{Visitor, walk_ty, walk_ty_param_bound, walk_fn_decl, walk_generics};
3+
use rustc::hir::def::Def;
4+
use rustc::hir::*;
5+
use rustc::hir::intravisit::{Visitor, walk_ty, walk_ty_param_bound, walk_fn_decl, walk_generics};
66
use std::collections::{HashSet, HashMap};
77
use syntax::codemap::Span;
88
use utils::{in_external_macro, span_lint};

Diff for: ‎src/loops.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use reexport::*;
2-
use rustc::front::map::Node::NodeBlock;
2+
use rustc::hir::*;
3+
use rustc::hir::def::Def;
4+
use rustc::hir::intravisit::{Visitor, walk_expr, walk_block, walk_decl};
5+
use rustc::hir::map::Node::NodeBlock;
36
use rustc::lint::*;
47
use rustc::middle::const_val::ConstVal;
5-
use rustc::middle::def::Def;
68
use rustc::middle::region::CodeExtent;
79
use rustc::ty;
810
use rustc_const_eval::EvalHint::ExprTypeChecked;
911
use rustc_const_eval::eval_const_expr_partial;
10-
use rustc_front::hir::*;
11-
use rustc_front::intravisit::{Visitor, walk_expr, walk_block, walk_decl};
1212
use std::borrow::Cow;
1313
use std::collections::HashMap;
1414
use syntax::ast;

Diff for: ‎src/map_clone.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc::lint::*;
2-
use rustc_front::hir::*;
2+
use rustc::hir::*;
33
use utils::{CLONE_PATH, OPTION_PATH};
44
use utils::{is_adjusted, match_path, match_trait_method, match_type, snippet, span_help_and_lint, walk_ptrs_ty,
55
walk_ptrs_ty_depth};

Diff for: ‎src/matches.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
use rustc::hir::*;
12
use rustc::lint::*;
23
use rustc::middle::const_val::ConstVal;
34
use rustc::ty;
45
use rustc_const_eval::EvalHint::ExprTypeChecked;
56
use rustc_const_eval::eval_const_expr_partial;
67
use rustc_const_math::ConstInt;
7-
use rustc_front::hir::*;
88
use std::cmp::Ordering;
99
use syntax::ast::LitKind;
1010
use syntax::codemap::Span;

Diff for: ‎src/methods.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
use rustc::hir::*;
12
use rustc::lint::*;
23
use rustc::middle::const_val::ConstVal;
34
use rustc::middle::cstore::CrateStore;
45
use rustc::ty::subst::{Subst, TypeSpace};
56
use rustc::ty;
67
use rustc_const_eval::EvalHint::ExprTypeChecked;
78
use rustc_const_eval::eval_const_expr_partial;
8-
use rustc_front::hir::*;
99
use std::borrow::Cow;
1010
use std::fmt;
1111
use syntax::codemap::Span;

Diff for: ‎src/minmax.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use consts::{Constant, constant_simple};
22
use rustc::lint::*;
3-
use rustc_front::hir::*;
3+
use rustc::hir::*;
44
use std::cmp::{PartialOrd, Ordering};
55
use syntax::ptr::P;
66
use utils::{match_def_path, span_lint};

Diff for: ‎src/misc.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
use reexport::*;
2+
use rustc::hir::*;
3+
use rustc::hir::intravisit::FnKind;
24
use rustc::lint::*;
35
use rustc::middle::const_val::ConstVal;
46
use rustc::ty;
57
use rustc_const_eval::EvalHint::ExprTypeChecked;
68
use rustc_const_eval::eval_const_expr_partial;
7-
use rustc_front::hir::*;
8-
use rustc_front::intravisit::FnKind;
9-
use rustc_front::util::{is_comparison_binop, binop_to_string};
109
use syntax::codemap::{Span, Spanned, ExpnFormat};
1110
use syntax::ptr::P;
1211
use utils::{get_item_name, match_path, snippet, get_parent_expr, span_lint};
@@ -105,7 +104,7 @@ impl LintPass for CmpNan {
105104
impl LateLintPass for CmpNan {
106105
fn check_expr(&mut self, cx: &LateContext, expr: &Expr) {
107106
if let ExprBinary(ref cmp, ref left, ref right) = expr.node {
108-
if is_comparison_binop(cmp.node) {
107+
if cmp.node.is_comparison() {
109108
if let ExprPath(_, ref path) = left.node {
110109
check_nan(cx, path, expr.span);
111110
}
@@ -170,7 +169,7 @@ impl LateLintPass for FloatCmp {
170169
&format!("{}-comparison of f32 or f64 detected. Consider changing this to `({} - {}).abs() < \
171170
epsilon` for some suitable value of epsilon. \
172171
std::f32::EPSILON and std::f64::EPSILON are available.",
173-
binop_to_string(op),
172+
op.as_str(),
174173
snippet(cx, left.span, ".."),
175174
snippet(cx, right.span, "..")));
176175
}
@@ -217,7 +216,7 @@ impl LintPass for CmpOwned {
217216
impl LateLintPass for CmpOwned {
218217
fn check_expr(&mut self, cx: &LateContext, expr: &Expr) {
219218
if let ExprBinary(ref cmp, ref left, ref right) = expr.node {
220-
if is_comparison_binop(cmp.node) {
219+
if cmp.node.is_comparison() {
221220
check_to_owned(cx, left, right, true, cmp.span);
222221
check_to_owned(cx, right, left, false, cmp.span)
223222
}

Diff for: ‎src/mut_mut.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::lint::*;
22
use rustc::ty::{TypeAndMut, TyRef};
3-
use rustc_front::hir::*;
3+
use rustc::hir::*;
44
use utils::{in_external_macro, span_lint};
55

66
/// **What it does:** This lint checks for instances of `mut mut` references.

0 commit comments

Comments
 (0)