From 0d8f8bc71fb35b217bdddced2a48c4e2205c5287 Mon Sep 17 00:00:00 2001 From: llogiq Date: Sat, 7 Dec 2019 18:47:43 +0100 Subject: [PATCH] Fix some clippy warnings (#1277) --- cranelift/codegen/build.rs | 2 +- .../codegen/meta/src/cdsl/type_inference.rs | 4 ++-- cranelift/codegen/meta/src/isa/x86/recipes.rs | 22 +++++++++---------- cranelift/codegen/src/binemit/memorysink.rs | 2 ++ cranelift/codegen/src/context.rs | 2 ++ cranelift/codegen/src/isa/mod.rs | 2 -- cranelift/codegen/src/isa/x86/abi.rs | 2 +- cranelift/codegen/src/licm.rs | 1 - cranelift/codegen/src/verifier/mod.rs | 2 +- cranelift/entity/src/boxed_slice.rs | 4 ++++ 10 files changed, 24 insertions(+), 19 deletions(-) diff --git a/cranelift/codegen/build.rs b/cranelift/codegen/build.rs index f2afc404e6..bb14364050 100644 --- a/cranelift/codegen/build.rs +++ b/cranelift/codegen/build.rs @@ -61,7 +61,7 @@ fn main() { process::exit(1); } - if let Ok(_) = env::var("CRANELIFT_VERBOSE") { + if env::var("CRANELIFT_VERBOSE").is_ok() { for isa in &isas { println!("cargo:warning=Includes support for {} ISA", isa.to_string()); } diff --git a/cranelift/codegen/meta/src/cdsl/type_inference.rs b/cranelift/codegen/meta/src/cdsl/type_inference.rs index 0313345175..25a07a9b84 100644 --- a/cranelift/codegen/meta/src/cdsl/type_inference.rs +++ b/cranelift/codegen/meta/src/cdsl/type_inference.rs @@ -459,7 +459,7 @@ fn constrain_fixpoint(tv1: &TypeVar, tv2: &TypeVar) { } } - let old_tv2_ts = tv2.get_typeset().clone(); + let old_tv2_ts = tv2.get_typeset(); tv1.constrain_types(tv2.clone()); // The above loop should ensure that all reference cycles have been handled. assert!(old_tv2_ts == tv2.get_typeset()); @@ -627,7 +627,7 @@ pub(crate) fn infer_transform( .map(|&var_index| { let var = var_pool.get_mut(var_index); let tv = type_env.get_equivalent(&var.get_or_create_typevar()); - (var_index, tv.get_typeset().clone()) + (var_index, tv.get_typeset()) }) .collect::>(); diff --git a/cranelift/codegen/meta/src/isa/x86/recipes.rs b/cranelift/codegen/meta/src/isa/x86/recipes.rs index 8d271238ea..92d339e6bd 100644 --- a/cranelift/codegen/meta/src/isa/x86/recipes.rs +++ b/cranelift/codegen/meta/src/isa/x86/recipes.rs @@ -1381,7 +1381,7 @@ pub(crate) fn define<'shared>( recipes.add_template_recipe( EncodingRecipeBuilder::new("fst", &formats.store, 1) .operands_in(vec![fpr, gpr]) - .inst_predicate(has_no_offset.clone()) + .inst_predicate(has_no_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_sib_or_offset_for_in_reg_1") .emit( @@ -1465,7 +1465,7 @@ pub(crate) fn define<'shared>( recipes.add_template_recipe( EncodingRecipeBuilder::new("fstDisp8", &formats.store, 2) .operands_in(vec![fpr, gpr]) - .inst_predicate(has_small_offset.clone()) + .inst_predicate(has_small_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_sib_for_in_reg_1") .emit( @@ -1628,7 +1628,7 @@ pub(crate) fn define<'shared>( recipes.add_template_recipe( EncodingRecipeBuilder::new("fstWithIndex", &formats.store_complex, 2) .operands_in(vec![fpr, gpr, gpr]) - .inst_predicate(has_no_offset.clone()) + .inst_predicate(has_no_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_offset_for_in_reg_1") .emit( @@ -1698,7 +1698,7 @@ pub(crate) fn define<'shared>( recipes.add_template_recipe( EncodingRecipeBuilder::new("fstWithIndexDisp8", &formats.store_complex, 3) .operands_in(vec![fpr, gpr, gpr]) - .inst_predicate(has_small_offset.clone()) + .inst_predicate(has_small_offset) .clobbers_flags(false) .emit( r#" @@ -1762,7 +1762,7 @@ pub(crate) fn define<'shared>( recipes.add_template_recipe( EncodingRecipeBuilder::new("fstWithIndexDisp32", &formats.store_complex, 6) .operands_in(vec![fpr, gpr, gpr]) - .inst_predicate(has_big_offset.clone()) + .inst_predicate(has_big_offset) .clobbers_flags(false) .emit( r#" @@ -1892,7 +1892,7 @@ pub(crate) fn define<'shared>( EncodingRecipeBuilder::new("fld", &formats.load, 1) .operands_in(vec![gpr]) .operands_out(vec![fpr]) - .inst_predicate(has_no_offset.clone()) + .inst_predicate(has_no_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_sib_or_offset_for_in_reg_0") .emit( @@ -1948,7 +1948,7 @@ pub(crate) fn define<'shared>( EncodingRecipeBuilder::new("fldDisp8", &formats.load, 2) .operands_in(vec![gpr]) .operands_out(vec![fpr]) - .inst_predicate(has_small_offset.clone()) + .inst_predicate(has_small_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_sib_for_in_reg_0") .emit( @@ -2003,7 +2003,7 @@ pub(crate) fn define<'shared>( EncodingRecipeBuilder::new("fldDisp32", &formats.load, 5) .operands_in(vec![gpr]) .operands_out(vec![fpr]) - .inst_predicate(has_big_offset.clone()) + .inst_predicate(has_big_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_sib_for_in_reg_0") .emit( @@ -2064,7 +2064,7 @@ pub(crate) fn define<'shared>( EncodingRecipeBuilder::new("fldWithIndex", &formats.load_complex, 2) .operands_in(vec![gpr, gpr]) .operands_out(vec![fpr]) - .inst_predicate(has_no_offset.clone()) + .inst_predicate(has_no_offset) .clobbers_flags(false) .compute_size("size_plus_maybe_offset_for_in_reg_0") .emit( @@ -2115,7 +2115,7 @@ pub(crate) fn define<'shared>( EncodingRecipeBuilder::new("fldWithIndexDisp8", &formats.load_complex, 3) .operands_in(vec![gpr, gpr]) .operands_out(vec![fpr]) - .inst_predicate(has_small_offset.clone()) + .inst_predicate(has_small_offset) .clobbers_flags(false) .emit( r#" @@ -2160,7 +2160,7 @@ pub(crate) fn define<'shared>( EncodingRecipeBuilder::new("fldWithIndexDisp32", &formats.load_complex, 6) .operands_in(vec![gpr, gpr]) .operands_out(vec![fpr]) - .inst_predicate(has_big_offset.clone()) + .inst_predicate(has_big_offset) .clobbers_flags(false) .emit( r#" diff --git a/cranelift/codegen/src/binemit/memorysink.rs b/cranelift/codegen/src/binemit/memorysink.rs index ac3e82bea2..7e1cdf57a2 100644 --- a/cranelift/codegen/src/binemit/memorysink.rs +++ b/cranelift/codegen/src/binemit/memorysink.rs @@ -46,6 +46,8 @@ pub struct MemoryCodeSink<'a> { impl<'a> MemoryCodeSink<'a> { /// Create a new memory code sink that writes a function to the memory pointed to by `data`. /// + /// # Safety + /// /// This function is unsafe since `MemoryCodeSink` does not perform bounds checking on the /// memory buffer, and it can't guarantee that the `data` pointer is valid. pub unsafe fn new( diff --git a/cranelift/codegen/src/context.rs b/cranelift/codegen/src/context.rs index 353b469bb6..c9fd1e6bcd 100644 --- a/cranelift/codegen/src/context.rs +++ b/cranelift/codegen/src/context.rs @@ -175,6 +175,8 @@ impl Context { /// /// The machine code is not relocated. Instead, any relocations are emitted into `relocs`. /// + /// # Safety + /// /// This function is unsafe since it does not perform bounds checking on the memory buffer, /// and it can't guarantee that the `mem` pointer is valid. /// diff --git a/cranelift/codegen/src/isa/mod.rs b/cranelift/codegen/src/isa/mod.rs index 35f3581d7e..5679333394 100644 --- a/cranelift/codegen/src/isa/mod.rs +++ b/cranelift/codegen/src/isa/mod.rs @@ -22,7 +22,6 @@ //! ``` //! # extern crate cranelift_codegen; //! # #[macro_use] extern crate target_lexicon; -//! # fn main() { //! use cranelift_codegen::isa; //! use cranelift_codegen::settings::{self, Configurable}; //! use std::str::FromStr; @@ -40,7 +39,6 @@ //! let isa = isa_builder.finish(shared_flags); //! } //! } -//! # } //! ``` //! //! The configured target ISA trait object is a `Box` which can be used for multiple diff --git a/cranelift/codegen/src/isa/x86/abi.rs b/cranelift/codegen/src/isa/x86/abi.rs index 1ee48ddfcb..78f3288fd5 100644 --- a/cranelift/codegen/src/isa/x86/abi.rs +++ b/cranelift/codegen/src/isa/x86/abi.rs @@ -938,7 +938,7 @@ fn insert_common_epilogue( .entry(fp_pop_inst) .and_modify(|insts| { *insts = insts - .into_iter() + .iter() .cloned() .chain(std::iter::once(new_cfa)) .collect::>(); diff --git a/cranelift/codegen/src/licm.rs b/cranelift/codegen/src/licm.rs index 35fd2c0a80..4fa5d314f6 100644 --- a/cranelift/codegen/src/licm.rs +++ b/cranelift/codegen/src/licm.rs @@ -73,7 +73,6 @@ fn create_pre_header( let pool = &mut ListPool::::new(); let header_args_values = func.dfg.ebb_params(header).to_vec(); let header_args_types: Vec = header_args_values - .clone() .into_iter() .map(|val| func.dfg.value_type(val)) .collect(); diff --git a/cranelift/codegen/src/verifier/mod.rs b/cranelift/codegen/src/verifier/mod.rs index 30990dbf9b..2e58ec4140 100644 --- a/cranelift/codegen/src/verifier/mod.rs +++ b/cranelift/codegen/src/verifier/mod.rs @@ -107,7 +107,7 @@ pub struct VerifierError { fn format_context(context: &Option) -> String { match context { None => "".to_string(), - Some(c) => format!(" ({})", c).to_string(), + Some(c) => format!(" ({})", c), } } diff --git a/cranelift/entity/src/boxed_slice.rs b/cranelift/entity/src/boxed_slice.rs index 8d01b60b7f..3b3b39155b 100644 --- a/cranelift/entity/src/boxed_slice.rs +++ b/cranelift/entity/src/boxed_slice.rs @@ -27,6 +27,10 @@ where { /// Create a new slice from a raw pointer. A safer way to create slices is /// to use `PrimaryMap::into_boxed_slice()`. + /// + /// # Safety + /// + /// This relies on `raw` pointing to a valid slice of `V`s. pub unsafe fn from_raw(raw: *mut [V]) -> Self { Self { elems: Box::from_raw(raw),