Skip to content

Commit f166b7d

Browse files
oli-obkoli-obk
authored
Merge pull request #3189 from eddyb/rextern
Reintroduce `extern crate` for non-Cargo dependencies.
2 parents 4aaef72 + c70bfb2 commit f166b7d

File tree

135 files changed

+745
-705
lines changed

Some content is hidden

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

135 files changed

+745
-705
lines changed

‎Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
cargo-features = ["edition"]
2+
13
[package]
24
name = "clippy"
35
version = "0.0.212"

‎clippy_lints/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
cargo-features = ["edition"]
2+
13
[package]
24
name = "clippy_lints"
35
# begin automatic update

‎clippy_lints/src/approx_const.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::utils::span_lint;
2-
use rustc::hir::*;
3-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4-
use rustc::{declare_tool_lint, lint_array};
2+
use crate::rustc::hir::*;
3+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4+
use crate::rustc::{declare_tool_lint, lint_array};
55
use std::f64::consts as f64;
6-
use syntax::ast::{FloatTy, Lit, LitKind};
7-
use syntax::symbol;
6+
use crate::syntax::ast::{FloatTy, Lit, LitKind};
7+
use crate::syntax::symbol;
88

99
/// **What it does:** Checks for floating point literals that approximate
1010
/// constants which are defined in

‎clippy_lints/src/arithmetic.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::utils::span_lint;
2-
use rustc::hir;
3-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4-
use rustc::{declare_tool_lint, lint_array};
5-
use syntax::source_map::Span;
2+
use crate::rustc::hir;
3+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4+
use crate::rustc::{declare_tool_lint, lint_array};
5+
use crate::syntax::source_map::Span;
66

77
/// **What it does:** Checks for plain integer arithmetic.
88
///

‎clippy_lints/src/assign_ops.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::utils::{get_trait_def_id, implements_trait, snippet_opt, span_lint_and_then, SpanlessEq};
22
use crate::utils::{higher, sugg};
3-
use rustc::hir;
4-
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
5-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
6-
use rustc::{declare_tool_lint, lint_array};
3+
use crate::rustc::hir;
4+
use crate::rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
5+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
6+
use crate::rustc::{declare_tool_lint, lint_array};
77
use if_chain::if_chain;
8-
use syntax::ast;
8+
use crate::syntax::ast;
99

1010
/// **What it does:** Checks for `a = a op b` or `a = b commutative_op a`
1111
/// patterns.
@@ -220,7 +220,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps {
220220
}
221221

222222
fn is_commutative(op: hir::BinOpKind) -> bool {
223-
use rustc::hir::BinOpKind::*;
223+
use crate::rustc::hir::BinOpKind::*;
224224
match op {
225225
Add | Mul | And | Or | BitXor | BitAnd | BitOr | Eq | Ne => true,
226226
Sub | Div | Rem | Shl | Shr | Lt | Le | Ge | Gt => false,

‎clippy_lints/src/attrs.rs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use crate::utils::{
55
in_macro, last_line_of_span, match_def_path, opt_def_id, paths, snippet_opt, span_lint, span_lint_and_then,
66
without_block_comments,
77
};
8-
use rustc::hir::*;
9-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
10-
use rustc::{declare_tool_lint, lint_array};
8+
use crate::rustc::hir::*;
9+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
10+
use crate::rustc::{declare_tool_lint, lint_array};
1111
use if_chain::if_chain;
12-
use rustc::ty::{self, TyCtxt};
12+
use crate::rustc::ty::{self, TyCtxt};
1313
use semver::Version;
14-
use syntax::ast::{AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem, NestedMetaItemKind};
15-
use syntax::source_map::Span;
14+
use crate::syntax::ast::{AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem, NestedMetaItemKind};
15+
use crate::syntax::source_map::Span;
1616

1717
/// **What it does:** Checks for items annotated with `#[inline(always)]`,
1818
/// unless the annotated function is empty or simply panics.
@@ -180,10 +180,15 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AttrPass {
180180
|| is_word(lint, "deprecated") {
181181
return
182182
},
183-
ItemKind::ExternCrate(..) => if is_word(lint, "unused_imports")
184-
&& skip_unused_imports {
183+
ItemKind::ExternCrate(..) => {
184+
if is_word(lint, "unused_imports")
185+
&& skip_unused_imports {
186+
return
187+
}
188+
if is_word(lint, "unused_extern_crates") {
185189
return
186-
},
190+
}
191+
}
187192
_ => {},
188193
}
189194
}

‎clippy_lints/src/bit_mask.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use rustc::hir::*;
2-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
3-
use rustc::{declare_tool_lint, lint_array};
1+
use crate::rustc::hir::*;
2+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
3+
use crate::rustc::{declare_tool_lint, lint_array};
44
use if_chain::if_chain;
5-
use syntax::ast::LitKind;
6-
use syntax::source_map::Span;
5+
use crate::syntax::ast::LitKind;
6+
use crate::syntax::source_map::Span;
77
use crate::utils::{span_lint, span_lint_and_then};
88
use crate::utils::sugg::Sugg;
99
use crate::consts::{constant, Constant};

‎clippy_lints/src/blacklisted_name.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
2-
use rustc::{declare_tool_lint, lint_array};
3-
use rustc::hir::*;
1+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
2+
use crate::rustc::{declare_tool_lint, lint_array};
3+
use crate::rustc::hir::*;
44
use crate::utils::span_lint;
55

66
/// **What it does:** Checks for usage of blacklisted names for variables, such

‎clippy_lints/src/block_in_if_condition.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use matches::matches;
2-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
3-
use rustc::{declare_tool_lint, lint_array};
4-
use rustc::hir::*;
5-
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
2+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
3+
use crate::rustc::{declare_tool_lint, lint_array};
4+
use crate::rustc::hir::*;
5+
use crate::rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
66
use crate::utils::*;
77

88
/// **What it does:** Checks for `if` conditions that use blocks to contain an

‎clippy_lints/src/booleans.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
2-
use rustc::{declare_tool_lint, lint_array};
3-
use rustc::hir::*;
4-
use rustc::hir::intravisit::*;
5-
use syntax::ast::{LitKind, NodeId, DUMMY_NODE_ID};
6-
use syntax::source_map::{dummy_spanned, Span, DUMMY_SP};
7-
use rustc_data_structures::thin_vec::ThinVec;
1+
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
2+
use crate::rustc::{declare_tool_lint, lint_array};
3+
use crate::rustc::hir::*;
4+
use crate::rustc::hir::intravisit::*;
5+
use crate::syntax::ast::{LitKind, NodeId, DUMMY_NODE_ID};
6+
use crate::syntax::source_map::{dummy_spanned, Span, DUMMY_SP};
7+
use crate::rustc_data_structures::thin_vec::ThinVec;
88
use crate::utils::{in_macro, paths, match_type, snippet_opt, span_lint_and_then, SpanlessEq, get_trait_def_id, implements_trait};
99

1010
/// **What it does:** Checks for boolean expressions that can be written more

0 commit comments

Comments
 (0)