Skip to content

Commit 7e834c8

Browse files
committed
Fix fallout
1 parent 321d64a commit 7e834c8

File tree

121 files changed

+224
-167
lines changed

Some content is hidden

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

121 files changed

+224
-167
lines changed

clippy_dev/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use regex::Regex;
66
use std::collections::HashMap;
77
use std::ffi::OsStr;
88
use std::fs;
9-
use std::io::prelude::*;
9+
use std::io::prelude::{Read, Write};
1010
use walkdir::WalkDir;
1111

1212
lazy_static! {

clippy_dev/src/main.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#![cfg_attr(feature = "deny-warnings", deny(warnings))]
22

33
use clap::{App, Arg, SubCommand};
4-
use clippy_dev::*;
4+
use clippy_dev::{
5+
gather_all, gen_changelog_lint_list, gen_deprecated, gen_lint_group_list, gen_modules_list, gen_register_lint_list,
6+
replace_region_in_file, Lint,
7+
};
58

69
mod fmt;
710
mod stderr_length_check;

clippy_dev/src/stderr_length_check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::ffi::OsStr;
22
use walkdir::WalkDir;
33

44
use std::fs::File;
5-
use std::io::prelude::*;
5+
use std::io::prelude::Read;
66

77
// The maximum length allowed for stderr files.
88
//

clippy_lints/src/approx_const.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::utils::span_lint;
22
use rustc::declare_lint_pass;
33
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4-
use rustc_hir::*;
4+
use rustc_hir::{Expr, ExprKind};
55
use rustc_session::declare_tool_lint;
66
use rustc_span::symbol;
77
use std::f64::consts as f64;

clippy_lints/src/as_conversions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc::declare_lint_pass;
22
use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
33
use rustc_session::declare_tool_lint;
4-
use syntax::ast::*;
4+
use syntax::ast::{Expr, ExprKind};
55

66
use crate::utils::span_help_and_lint;
77

clippy_lints/src/assertions_on_constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::utils::{is_direct_expn_of, is_expn_of, match_function_call, snippet_o
44
use if_chain::if_chain;
55
use rustc::declare_lint_pass;
66
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
7-
use rustc_hir::*;
7+
use rustc_hir::{Expr, ExprKind, PatKind, UnOp};
88
use rustc_session::declare_tool_lint;
99
use syntax::ast::LitKind;
1010

clippy_lints/src/assign_ops.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ fn lint_misrefactored_assign_op(
232232

233233
#[must_use]
234234
fn is_commutative(op: hir::BinOpKind) -> bool {
235-
use rustc_hir::BinOpKind::*;
235+
use rustc_hir::BinOpKind::{
236+
Add, And, BitAnd, BitOr, BitXor, Div, Eq, Ge, Gt, Le, Lt, Mul, Ne, Or, Rem, Shl, Shr, Sub,
237+
};
236238
match op {
237239
Add | Mul | And | Or | BitXor | BitAnd | BitOr | Eq | Ne => true,
238240
Sub | Div | Rem | Shl | Shr | Lt | Le | Ge | Gt => false,

clippy_lints/src/atomic_ordering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc::declare_lint_pass;
44
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
55
use rustc::ty;
66
use rustc_hir::def_id::DefId;
7-
use rustc_hir::*;
7+
use rustc_hir::{Expr, ExprKind};
88
use rustc_session::declare_tool_lint;
99

1010
declare_clippy_lint! {

clippy_lints/src/attrs.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! checks for attributes
22
3-
use crate::reexport::*;
3+
use crate::reexport::Name;
44
use crate::utils::{
55
is_present_in_source, last_line_of_span, match_def_path, paths, snippet_opt, span_lint, span_lint_and_sugg,
66
span_lint_and_then, without_block_comments,
@@ -13,7 +13,9 @@ use rustc::lint::{
1313
};
1414
use rustc::ty;
1515
use rustc_errors::Applicability;
16-
use rustc_hir::*;
16+
use rustc_hir::{
17+
Block, Expr, ExprKind, ImplItem, ImplItemKind, Item, ItemKind, StmtKind, TraitItem, TraitItemKind, TraitMethod,
18+
};
1719
use rustc_session::declare_tool_lint;
1820
use rustc_span::source_map::Span;
1921
use rustc_span::symbol::Symbol;

clippy_lints/src/bit_mask.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use if_chain::if_chain;
55
use rustc::impl_lint_pass;
66
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
77
use rustc_errors::Applicability;
8-
use rustc_hir::*;
8+
use rustc_hir::{BinOpKind, Expr, ExprKind};
99
use rustc_session::declare_tool_lint;
1010
use rustc_span::source_map::Span;
1111
use syntax::ast::LitKind;

0 commit comments

Comments
 (0)