diff --git a/lib/codegen/meta/gen_instr.py b/lib/codegen/meta/gen_instr.py index fa48dcb945..a59f5d71da 100644 --- a/lib/codegen/meta/gen_instr.py +++ b/lib/codegen/meta/gen_instr.py @@ -631,7 +631,7 @@ def gen_member_inits(iform, fmt): # Immediate operands. # We have local variables with the same names as the members. for f in iform.imm_fields: - fmt.line('{}: {},'.format(f.member, f.member)) + fmt.line('{},'.format(f.member)) # Value operands. if iform.has_value_list: diff --git a/lib/codegen/src/lib.rs b/lib/codegen/src/lib.rs index f9ce64bcf8..b58a6b0e17 100644 --- a/lib/codegen/src/lib.rs +++ b/lib/codegen/src/lib.rs @@ -5,8 +5,6 @@ #![cfg_attr(feature = "std", warn(unstable_features))] #![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] #![cfg_attr(feature="cargo-clippy", allow( -// Rustfmt 0.9.0 is at odds with this lint: - block_in_if_condition_stmt, // Produces only a false positive: while_let_loop, // Produces many false positives, but did produce some valid lints, now fixed: @@ -28,8 +26,6 @@ new_without_default, new_without_default_derive, should_implement_trait, - redundant_field_names, - useless_let_if_seq, len_without_is_empty))] #![cfg_attr( feature = "cargo-clippy", diff --git a/lib/codegen/src/postopt.rs b/lib/codegen/src/postopt.rs index 29ef49f758..b850b5ac08 100644 --- a/lib/codegen/src/postopt.rs +++ b/lib/codegen/src/postopt.rs @@ -188,13 +188,13 @@ fn optimize_complex_addresses(pos: &mut EncCursor, inst: Inst, isa: &TargetIsa) flags, offset, } => MemOpInfo { - opcode: opcode, - inst: inst, + opcode, + inst, itype: pos.func.dfg.ctrl_typevar(inst), - arg: arg, + arg, st_arg: None, - flags: flags, - offset: offset, + flags, + offset, add_args: None, }, InstructionData::Store { @@ -203,13 +203,13 @@ fn optimize_complex_addresses(pos: &mut EncCursor, inst: Inst, isa: &TargetIsa) flags, offset, } => MemOpInfo { - opcode: opcode, - inst: inst, + opcode, + inst, itype: pos.func.dfg.ctrl_typevar(inst), arg: args[1], st_arg: Some(args[0]), - flags: flags, - offset: offset, + flags, + offset, add_args: None, }, _ => return, diff --git a/lib/filetests/src/lib.rs b/lib/filetests/src/lib.rs index 6d98c991f2..db1898f25f 100644 --- a/lib/filetests/src/lib.rs +++ b/lib/filetests/src/lib.rs @@ -6,9 +6,7 @@ #![deny(missing_docs, trivial_numeric_casts, unused_extern_crates)] #![warn(unused_import_braces, unstable_features)] #![cfg_attr(feature="cargo-clippy", allow( - type_complexity, -// Rustfmt 0.9.0 is at odds with this lint: - block_in_if_condition_stmt))] + type_complexity))] #![cfg_attr( feature = "cargo-clippy", warn(