Fix some clippy warnings (#1277)

This commit is contained in:
llogiq
2019-12-07 18:47:43 +01:00
committed by Andrew Brown
parent 2c51341888
commit 0d8f8bc71f
10 changed files with 24 additions and 19 deletions

View File

@@ -61,7 +61,7 @@ fn main() {
process::exit(1); process::exit(1);
} }
if let Ok(_) = env::var("CRANELIFT_VERBOSE") { if env::var("CRANELIFT_VERBOSE").is_ok() {
for isa in &isas { for isa in &isas {
println!("cargo:warning=Includes support for {} ISA", isa.to_string()); println!("cargo:warning=Includes support for {} ISA", isa.to_string());
} }

View File

@@ -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()); tv1.constrain_types(tv2.clone());
// The above loop should ensure that all reference cycles have been handled. // The above loop should ensure that all reference cycles have been handled.
assert!(old_tv2_ts == tv2.get_typeset()); assert!(old_tv2_ts == tv2.get_typeset());
@@ -627,7 +627,7 @@ pub(crate) fn infer_transform(
.map(|&var_index| { .map(|&var_index| {
let var = var_pool.get_mut(var_index); let var = var_pool.get_mut(var_index);
let tv = type_env.get_equivalent(&var.get_or_create_typevar()); let tv = type_env.get_equivalent(&var.get_or_create_typevar());
(var_index, tv.get_typeset().clone()) (var_index, tv.get_typeset())
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();

View File

@@ -1381,7 +1381,7 @@ pub(crate) fn define<'shared>(
recipes.add_template_recipe( recipes.add_template_recipe(
EncodingRecipeBuilder::new("fst", &formats.store, 1) EncodingRecipeBuilder::new("fst", &formats.store, 1)
.operands_in(vec![fpr, gpr]) .operands_in(vec![fpr, gpr])
.inst_predicate(has_no_offset.clone()) .inst_predicate(has_no_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_sib_or_offset_for_in_reg_1") .compute_size("size_plus_maybe_sib_or_offset_for_in_reg_1")
.emit( .emit(
@@ -1465,7 +1465,7 @@ pub(crate) fn define<'shared>(
recipes.add_template_recipe( recipes.add_template_recipe(
EncodingRecipeBuilder::new("fstDisp8", &formats.store, 2) EncodingRecipeBuilder::new("fstDisp8", &formats.store, 2)
.operands_in(vec![fpr, gpr]) .operands_in(vec![fpr, gpr])
.inst_predicate(has_small_offset.clone()) .inst_predicate(has_small_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_sib_for_in_reg_1") .compute_size("size_plus_maybe_sib_for_in_reg_1")
.emit( .emit(
@@ -1628,7 +1628,7 @@ pub(crate) fn define<'shared>(
recipes.add_template_recipe( recipes.add_template_recipe(
EncodingRecipeBuilder::new("fstWithIndex", &formats.store_complex, 2) EncodingRecipeBuilder::new("fstWithIndex", &formats.store_complex, 2)
.operands_in(vec![fpr, gpr, gpr]) .operands_in(vec![fpr, gpr, gpr])
.inst_predicate(has_no_offset.clone()) .inst_predicate(has_no_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_offset_for_in_reg_1") .compute_size("size_plus_maybe_offset_for_in_reg_1")
.emit( .emit(
@@ -1698,7 +1698,7 @@ pub(crate) fn define<'shared>(
recipes.add_template_recipe( recipes.add_template_recipe(
EncodingRecipeBuilder::new("fstWithIndexDisp8", &formats.store_complex, 3) EncodingRecipeBuilder::new("fstWithIndexDisp8", &formats.store_complex, 3)
.operands_in(vec![fpr, gpr, gpr]) .operands_in(vec![fpr, gpr, gpr])
.inst_predicate(has_small_offset.clone()) .inst_predicate(has_small_offset)
.clobbers_flags(false) .clobbers_flags(false)
.emit( .emit(
r#" r#"
@@ -1762,7 +1762,7 @@ pub(crate) fn define<'shared>(
recipes.add_template_recipe( recipes.add_template_recipe(
EncodingRecipeBuilder::new("fstWithIndexDisp32", &formats.store_complex, 6) EncodingRecipeBuilder::new("fstWithIndexDisp32", &formats.store_complex, 6)
.operands_in(vec![fpr, gpr, gpr]) .operands_in(vec![fpr, gpr, gpr])
.inst_predicate(has_big_offset.clone()) .inst_predicate(has_big_offset)
.clobbers_flags(false) .clobbers_flags(false)
.emit( .emit(
r#" r#"
@@ -1892,7 +1892,7 @@ pub(crate) fn define<'shared>(
EncodingRecipeBuilder::new("fld", &formats.load, 1) EncodingRecipeBuilder::new("fld", &formats.load, 1)
.operands_in(vec![gpr]) .operands_in(vec![gpr])
.operands_out(vec![fpr]) .operands_out(vec![fpr])
.inst_predicate(has_no_offset.clone()) .inst_predicate(has_no_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_sib_or_offset_for_in_reg_0") .compute_size("size_plus_maybe_sib_or_offset_for_in_reg_0")
.emit( .emit(
@@ -1948,7 +1948,7 @@ pub(crate) fn define<'shared>(
EncodingRecipeBuilder::new("fldDisp8", &formats.load, 2) EncodingRecipeBuilder::new("fldDisp8", &formats.load, 2)
.operands_in(vec![gpr]) .operands_in(vec![gpr])
.operands_out(vec![fpr]) .operands_out(vec![fpr])
.inst_predicate(has_small_offset.clone()) .inst_predicate(has_small_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_sib_for_in_reg_0") .compute_size("size_plus_maybe_sib_for_in_reg_0")
.emit( .emit(
@@ -2003,7 +2003,7 @@ pub(crate) fn define<'shared>(
EncodingRecipeBuilder::new("fldDisp32", &formats.load, 5) EncodingRecipeBuilder::new("fldDisp32", &formats.load, 5)
.operands_in(vec![gpr]) .operands_in(vec![gpr])
.operands_out(vec![fpr]) .operands_out(vec![fpr])
.inst_predicate(has_big_offset.clone()) .inst_predicate(has_big_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_sib_for_in_reg_0") .compute_size("size_plus_maybe_sib_for_in_reg_0")
.emit( .emit(
@@ -2064,7 +2064,7 @@ pub(crate) fn define<'shared>(
EncodingRecipeBuilder::new("fldWithIndex", &formats.load_complex, 2) EncodingRecipeBuilder::new("fldWithIndex", &formats.load_complex, 2)
.operands_in(vec![gpr, gpr]) .operands_in(vec![gpr, gpr])
.operands_out(vec![fpr]) .operands_out(vec![fpr])
.inst_predicate(has_no_offset.clone()) .inst_predicate(has_no_offset)
.clobbers_flags(false) .clobbers_flags(false)
.compute_size("size_plus_maybe_offset_for_in_reg_0") .compute_size("size_plus_maybe_offset_for_in_reg_0")
.emit( .emit(
@@ -2115,7 +2115,7 @@ pub(crate) fn define<'shared>(
EncodingRecipeBuilder::new("fldWithIndexDisp8", &formats.load_complex, 3) EncodingRecipeBuilder::new("fldWithIndexDisp8", &formats.load_complex, 3)
.operands_in(vec![gpr, gpr]) .operands_in(vec![gpr, gpr])
.operands_out(vec![fpr]) .operands_out(vec![fpr])
.inst_predicate(has_small_offset.clone()) .inst_predicate(has_small_offset)
.clobbers_flags(false) .clobbers_flags(false)
.emit( .emit(
r#" r#"
@@ -2160,7 +2160,7 @@ pub(crate) fn define<'shared>(
EncodingRecipeBuilder::new("fldWithIndexDisp32", &formats.load_complex, 6) EncodingRecipeBuilder::new("fldWithIndexDisp32", &formats.load_complex, 6)
.operands_in(vec![gpr, gpr]) .operands_in(vec![gpr, gpr])
.operands_out(vec![fpr]) .operands_out(vec![fpr])
.inst_predicate(has_big_offset.clone()) .inst_predicate(has_big_offset)
.clobbers_flags(false) .clobbers_flags(false)
.emit( .emit(
r#" r#"

View File

@@ -46,6 +46,8 @@ pub struct MemoryCodeSink<'a> {
impl<'a> MemoryCodeSink<'a> { impl<'a> MemoryCodeSink<'a> {
/// Create a new memory code sink that writes a function to the memory pointed to by `data`. /// 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 /// 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. /// memory buffer, and it can't guarantee that the `data` pointer is valid.
pub unsafe fn new( pub unsafe fn new(

View File

@@ -175,6 +175,8 @@ impl Context {
/// ///
/// The machine code is not relocated. Instead, any relocations are emitted into `relocs`. /// 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, /// 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. /// and it can't guarantee that the `mem` pointer is valid.
/// ///

View File

@@ -22,7 +22,6 @@
//! ``` //! ```
//! # extern crate cranelift_codegen; //! # extern crate cranelift_codegen;
//! # #[macro_use] extern crate target_lexicon; //! # #[macro_use] extern crate target_lexicon;
//! # fn main() {
//! use cranelift_codegen::isa; //! use cranelift_codegen::isa;
//! use cranelift_codegen::settings::{self, Configurable}; //! use cranelift_codegen::settings::{self, Configurable};
//! use std::str::FromStr; //! use std::str::FromStr;
@@ -40,7 +39,6 @@
//! let isa = isa_builder.finish(shared_flags); //! let isa = isa_builder.finish(shared_flags);
//! } //! }
//! } //! }
//! # }
//! ``` //! ```
//! //!
//! The configured target ISA trait object is a `Box<TargetIsa>` which can be used for multiple //! The configured target ISA trait object is a `Box<TargetIsa>` which can be used for multiple

View File

@@ -938,7 +938,7 @@ fn insert_common_epilogue(
.entry(fp_pop_inst) .entry(fp_pop_inst)
.and_modify(|insts| { .and_modify(|insts| {
*insts = insts *insts = insts
.into_iter() .iter()
.cloned() .cloned()
.chain(std::iter::once(new_cfa)) .chain(std::iter::once(new_cfa))
.collect::<Box<[_]>>(); .collect::<Box<[_]>>();

View File

@@ -73,7 +73,6 @@ fn create_pre_header(
let pool = &mut ListPool::<Value>::new(); let pool = &mut ListPool::<Value>::new();
let header_args_values = func.dfg.ebb_params(header).to_vec(); let header_args_values = func.dfg.ebb_params(header).to_vec();
let header_args_types: Vec<Type> = header_args_values let header_args_types: Vec<Type> = header_args_values
.clone()
.into_iter() .into_iter()
.map(|val| func.dfg.value_type(val)) .map(|val| func.dfg.value_type(val))
.collect(); .collect();

View File

@@ -107,7 +107,7 @@ pub struct VerifierError {
fn format_context(context: &Option<String>) -> String { fn format_context(context: &Option<String>) -> String {
match context { match context {
None => "".to_string(), None => "".to_string(),
Some(c) => format!(" ({})", c).to_string(), Some(c) => format!(" ({})", c),
} }
} }

View File

@@ -27,6 +27,10 @@ where
{ {
/// Create a new slice from a raw pointer. A safer way to create slices is /// Create a new slice from a raw pointer. A safer way to create slices is
/// to use `PrimaryMap::into_boxed_slice()`. /// 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 { pub unsafe fn from_raw(raw: *mut [V]) -> Self {
Self { Self {
elems: Box::from_raw(raw), elems: Box::from_raw(raw),