Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3085 from mikerite/revert-98dbce

Browse source 
Revert "Fix E0502 warnings"
This commit is contained in:
Philipp Hansch 2018-09-13 06:33:26 +01:00 committed by GitHub
commit e8400061bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clippy_lints/src/lib.rs
View file

@ -377,11 +377,9 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
reg.register_late_lint_pass(box large_enum_variant::LargeEnumVariant::new(conf.enum_variant_size_threshold)); reg.register_late_lint_pass(box large_enum_variant::LargeEnumVariant::new(conf.enum_variant_size_threshold));
reg.register_late_lint_pass(box explicit_write::Pass); reg.register_late_lint_pass(box explicit_write::Pass);
reg.register_late_lint_pass(box needless_pass_by_value::NeedlessPassByValue); reg.register_late_lint_pass(box needless_pass_by_value::NeedlessPassByValue);
let target = &reg.sess.target;
reg.register_late_lint_pass(box trivially_copy_pass_by_ref::TriviallyCopyPassByRef::new( reg.register_late_lint_pass(box trivially_copy_pass_by_ref::TriviallyCopyPassByRef::new(
conf.trivial_copy_size_limit, conf.trivial_copy_size_limit,
target, &reg.sess.target,
)); ));
reg.register_early_lint_pass(box literal_representation::LiteralDigitGrouping); reg.register_early_lint_pass(box literal_representation::LiteralDigitGrouping);
reg.register_early_lint_pass(box literal_representation::LiteralRepresentation::new( reg.register_early_lint_pass(box literal_representation::LiteralRepresentation::new(

6
clippy_lints/src/utils/hir_utils.rs
View file

@ -454,8 +454,7 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> {
CaptureClause::CaptureByValue => 0, CaptureClause::CaptureByValue => 0,
CaptureClause::CaptureByRef => 1, CaptureClause::CaptureByRef => 1,
}.hash(&mut self.s); }.hash(&mut self.s);
let value = &self.cx.tcx.hir.body(eid).value; self.hash_expr(&self.cx.tcx.hir.body(eid).value);
self.hash_expr(value);
}, },
ExprKind::Field(ref e, ref f) => { ExprKind::Field(ref e, ref f) => {
let c: fn(_, _) -> _ = ExprKind::Field; let c: fn(_, _) -> _ = ExprKind::Field;
@ -522,8 +521,7 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> {
self.hash_expr(e); self.hash_expr(e);
let full_table = self.tables; let full_table = self.tables;
self.tables = self.cx.tcx.body_tables(l_id.body); self.tables = self.cx.tcx.body_tables(l_id.body);
let value = &self.cx.tcx.hir.body(l_id.body).value; self.hash_expr(&self.cx.tcx.hir.body(l_id.body).value);
self.hash_expr(value);
self.tables = full_table; self.tables = full_table;
}, },
ExprKind::Ret(ref e) => { ExprKind::Ret(ref e) => {