T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid redundant '@ _' in match patterns.

Browse Source 
https://github.com/rust-lang-nursery/rust-clippy/wiki#redundant_pattern
This commit is contained in:
Dan Gohman
2017-08-31 12:18:03 -07:00
parent ebbb836bb9
commit bc528917fd
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wasm/src/module_translator.rs
View File

@@ -68,7 +68,7 @@ pub fn translate_module(
ParserState::Error(BinaryReaderError { message, offset }) => { ParserState::Error(BinaryReaderError { message, offset }) => {
return Err(format!("at offset {}: {}", offset, message)); return Err(format!("at offset {}: {}", offset, message));
} }
ref s @ _ => panic!("modules should begin properly: {:?}", s), ref s => panic!("modules should begin properly: {:?}", s),
} }
let mut signatures = None; let mut signatures = None;
let mut functions: Option<Vec<SignatureIndex>> = None; let mut functions: Option<Vec<SignatureIndex>> = None;

48
lib/wasm/src/sections_translator.rs
View File

@@ -55,7 +55,7 @@ pub fn parse_function_signatures(
})); }));
signatures.push(sig); signatures.push(sig);
} }
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
} }
} }
Ok(signatures) Ok(signatures)
@@ -99,7 +99,7 @@ pub fn parse_import_section(parser: &mut Parser) -> Result<Vec<Import>, SectionP
})); }));
} }
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(imports) Ok(imports)
@@ -114,7 +114,7 @@ pub fn parse_function_section(
match *parser.read() { match *parser.read() {
ParserState::FunctionSectionEntry(sigindex) => funcs.push(sigindex as SignatureIndex), ParserState::FunctionSectionEntry(sigindex) => funcs.push(sigindex as SignatureIndex),
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(funcs) Ok(funcs)
@@ -143,7 +143,7 @@ pub fn parse_export_section(
} }
} }
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(exports) Ok(exports)
@@ -161,7 +161,7 @@ pub fn parse_memory_section(parser: &mut Parser) -> Result<Vec<Memory>, SectionP
}) })
} }
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(memories) Ok(memories)
@@ -177,11 +177,11 @@ pub fn parse_global_section(
let (content_type, mutability) = match *parser.read() { let (content_type, mutability) = match *parser.read() {
ParserState::BeginGlobalSectionEntry(ref ty) => (ty.content_type, ty.mutability), ParserState::BeginGlobalSectionEntry(ref ty) => (ty.content_type, ty.mutability),
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::BeginInitExpressionBody => (), ParserState::BeginInitExpressionBody => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
} }
let initializer = match *parser.read() { let initializer = match *parser.read() {
ParserState::InitExpressionOperator(Operator::I32Const { value }) => { ParserState::InitExpressionOperator(Operator::I32Const { value }) => {
@@ -199,12 +199,12 @@ pub fn parse_global_section(
ParserState::InitExpressionOperator(Operator::GetGlobal { global_index }) => { ParserState::InitExpressionOperator(Operator::GetGlobal { global_index }) => {
GlobalInit::GlobalRef(global_index as GlobalIndex) GlobalInit::GlobalRef(global_index as GlobalIndex)
} }
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::EndInitExpressionBody => (), ParserState::EndInitExpressionBody => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
} }
let global = Global { let global = Global {
ty: type_to_type(&content_type).unwrap(), ty: type_to_type(&content_type).unwrap(),
@@ -215,7 +215,7 @@ pub fn parse_global_section(
globals.push(global); globals.push(global);
match *parser.read() { match *parser.read() {
ParserState::EndGlobalSectionEntry => (), ParserState::EndGlobalSectionEntry => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
} }
} }
Ok(globals) Ok(globals)
@@ -230,11 +230,11 @@ pub fn parse_data_section(
let memory_index = match *parser.read() { let memory_index = match *parser.read() {
ParserState::BeginDataSectionEntry(memory_index) => memory_index, ParserState::BeginDataSectionEntry(memory_index) => memory_index,
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::BeginInitExpressionBody => (), ParserState::BeginInitExpressionBody => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
let offset = match *parser.read() { let offset = match *parser.read() {
ParserState::InitExpressionOperator(Operator::I32Const { value }) => { ParserState::InitExpressionOperator(Operator::I32Const { value }) => {
@@ -268,18 +268,16 @@ pub fn parse_data_section(
_ => panic!("should not happen"), _ => panic!("should not happen"),
} }
} }
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::EndInitExpressionBody => (), ParserState::EndInitExpressionBody => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
{ {
let data = match *parser.read() { let data = match *parser.read() {
ParserState::DataSectionEntryBody(data) => data, ParserState::DataSectionEntryBody(data) => data,
ref s @ _ => { ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s)))
}
}; };
match runtime.declare_data_initialization(memory_index as MemoryIndex, offset, data) { match runtime.declare_data_initialization(memory_index as MemoryIndex, offset, data) {
Ok(()) => (), Ok(()) => (),
@@ -288,7 +286,7 @@ pub fn parse_data_section(
} }
match *parser.read() { match *parser.read() {
ParserState::EndDataSectionEntry => (), ParserState::EndDataSectionEntry => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(()) Ok(())
@@ -312,7 +310,7 @@ pub fn parse_table_section(
}) })
} }
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(()) Ok(())
@@ -328,11 +326,11 @@ pub fn parse_elements_section(
let table_index = match *parser.read() { let table_index = match *parser.read() {
ParserState::BeginElementSectionEntry(ref table_index) => *table_index as TableIndex, ParserState::BeginElementSectionEntry(ref table_index) => *table_index as TableIndex,
ParserState::EndSection => break, ParserState::EndSection => break,
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::BeginInitExpressionBody => (), ParserState::BeginInitExpressionBody => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
let offset = match *parser.read() { let offset = match *parser.read() {
ParserState::InitExpressionOperator(Operator::I32Const { value }) => { ParserState::InitExpressionOperator(Operator::I32Const { value }) => {
@@ -361,11 +359,11 @@ pub fn parse_elements_section(
_ => panic!("should not happen"), _ => panic!("should not happen"),
} }
} }
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::EndInitExpressionBody => (), ParserState::EndInitExpressionBody => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::ElementSectionEntryBody(ref elements) => { ParserState::ElementSectionEntryBody(ref elements) => {
@@ -373,11 +371,11 @@ pub fn parse_elements_section(
elements.iter().map(|&x| x as FunctionIndex).collect(); elements.iter().map(|&x| x as FunctionIndex).collect();
runtime.declare_table_elements(table_index, offset, elems.as_slice()) runtime.declare_table_elements(table_index, offset, elems.as_slice())
} }
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
match *parser.read() { match *parser.read() {
ParserState::EndElementSectionEntry => (), ParserState::EndElementSectionEntry => (),
ref s @ _ => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };
} }
Ok(()) Ok(())