Fixing a couple clippy warnings : #392

This commit is contained in:
ms2300
2018-08-17 11:13:06 -06:00
committed by Dan Gohman
parent 37272f5ceb
commit 30d09cf6b0
4 changed files with 15 additions and 16 deletions

View File

@@ -33,16 +33,15 @@ fn call_ser(file: &str, pretty: bool) -> Result<(), String> {
match ret_of_parse {
Ok(funcs) => {
let ser_funcs = serde_clif_json::SerObj::new(&funcs);
let ser_str: String;
if pretty {
ser_str = serde_json::to_string_pretty(&ser_funcs).unwrap();
let ser_str = if pretty {
serde_json::to_string_pretty(&ser_funcs).unwrap()
} else {
ser_str = serde_json::to_string(&ser_funcs).unwrap();
}
serde_json::to_string(&ser_funcs).unwrap()
};
println!("{}", ser_str);
Ok(())
}
Err(_pe) => Err(format!("There was a parsing error")),
Err(_pe) => Err("There was a parsing error".to_string()),
}
}
@@ -99,7 +98,7 @@ fn main() {
File::open(m.value_of("FILE").unwrap()).expect("Unable to open the file");
call_de(&file)
}
_ => Err(format!("Invalid subcommand.")),
_ => Err("Invalid subcommand.".to_string()),
};
if let Err(mut msg) = res_serde {

View File

@@ -250,7 +250,7 @@ pub fn get_inst_data(inst_index: Inst, func: &Function) -> SerInstData {
},
InstructionData::UnaryBool { opcode, imm } => SerInstData::UnaryBool {
opcode: opcode.to_string(),
imm: imm,
imm,
},
InstructionData::UnaryGlobalValue {
opcode,
@@ -759,10 +759,10 @@ impl SerSignature {
fn create_new(sig: &Signature) -> Self {
let mut params_vec: Vec<String> = Vec::new();
let mut returns_vec: Vec<String> = Vec::new();
for param in sig.params.iter() {
for param in &sig.params {
params_vec.push(param.to_string());
}
for ret in sig.returns.iter() {
for ret in &sig.returns {
returns_vec.push(ret.to_string());
}
Self {
@@ -818,7 +818,7 @@ impl SerObj {
Self { functions: funcs }
}
pub fn new(funcs: &Vec<Function>) -> Self {
pub fn new(funcs: &[Function]) -> Self {
let mut func_vec: Vec<SerFunction> = Vec::new();
for func in funcs {
let mut ser_func: SerFunction = SerFunction::new(&func);