Fix some additional clippy warnings

This commit is contained in:
Andrew Brown
2020-01-09 11:46:21 -08:00
parent 71914c7668
commit e8c3302bc5
4 changed files with 8 additions and 4 deletions

View File

@@ -56,7 +56,7 @@ pub struct FrameLayout {
impl FrameLayout {
/// Create instance of FrameLayout.
pub fn new() -> Self {
FrameLayout {
Self {
initial: vec![].into_boxed_slice(),
instructions: HashMap::new(),
}

View File

@@ -64,7 +64,7 @@ fn rex3(rm: RegUnit, reg: RegUnit, index: RegUnit) -> u8 {
/// Determines whether a REX prefix should be emitted.
#[inline]
fn needs_rex(bits: u16, rex: u8) -> bool {
rex != BASE_REX || u8::from(EncodingBits::from(bits).rex_w()) == 1
rex != BASE_REX || EncodingBits::from(bits).rex_w() == 1
}
// Emit a REX prefix.
@@ -74,7 +74,7 @@ fn needs_rex(bits: u16, rex: u8) -> bool {
fn rex_prefix<CS: CodeSink + ?Sized>(bits: u16, rex: u8, sink: &mut CS) {
debug_assert_eq!(rex & 0xf8, BASE_REX);
let w = EncodingBits::from(bits).rex_w();
sink.put1(rex | (u8::from(w) << 3));
sink.put1(rex | (w << 3));
}
// Emit a single-byte opcode with no REX prefix.

View File

@@ -124,7 +124,8 @@ pub fn do_simple_gvn(func: &mut Function, domtree: &mut DominatorTree) {
use crate::scoped_hash_map::Entry::*;
match visible_values.entry(key) {
Occupied(entry) => {
debug_assert!(domtree.dominates(*entry.get(), inst, &func.layout));
let layout = &func.layout;
debug_assert!(domtree.dominates(*entry.get(), inst, layout));
// If the redundant instruction is representing the current
// scope, pick a new representative.
let old = scope_stack.last_mut().unwrap();

View File

@@ -306,6 +306,7 @@ pub trait FuncEnvironment: TargetEnvironment {
/// The `index` provided identifies the linear memory to query, and `heap` is the heap reference
/// returned by `make_heap` for the same index. `seg_index` is the index of the segment to copy
/// from.
#[allow(clippy::too_many_arguments)]
fn translate_memory_init(
&mut self,
pos: FuncCursor,
@@ -329,6 +330,7 @@ pub trait FuncEnvironment: TargetEnvironment {
) -> WasmResult<ir::Value>;
/// Translate a `table.copy` WebAssembly instruction.
#[allow(clippy::too_many_arguments)]
fn translate_table_copy(
&mut self,
pos: FuncCursor,
@@ -342,6 +344,7 @@ pub trait FuncEnvironment: TargetEnvironment {
) -> WasmResult<()>;
/// Translate a `table.init` WebAssembly instruction.
#[allow(clippy::too_many_arguments)]
fn translate_table_init(
&mut self,
pos: FuncCursor,