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

Update to the rustfmt in rust 1.32, which is now stable.

Browse Source
This commit is contained in:
Dan Gohman
2019-01-22 13:27:03 -08:00
parent 363eea6960
commit 1fdf1c92d9
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/codegen/src/isa/x86/abi.rs
View File

@@ -99,7 +99,7 @@ impl ArgAssigner for Args {
} else { } else {
RU::rsi RU::rsi
} as RegUnit) } as RegUnit)
.into() .into();
} }
// This is SpiderMonkey's `WasmTableCallSigReg`. // This is SpiderMonkey's `WasmTableCallSigReg`.
ArgumentPurpose::SignatureId => return ArgumentLoc::Reg(RU::r10 as RegUnit).into(), ArgumentPurpose::SignatureId => return ArgumentLoc::Reg(RU::r10 as RegUnit).into(),

6
lib/codegen/src/verifier/liveness.rs
View File

@@ -186,7 +186,7 @@ impl<'a> LivenessVerifier<'a> {
"Def local range for {} can't end at {}", "Def local range for {} can't end at {}",
val, val,
e e
) );
} }
ExpandedProgramPoint::Inst(i) => { ExpandedProgramPoint::Inst(i) => {
if self.func.layout.inst_ebb(i) != Some(def_ebb) { if self.func.layout.inst_ebb(i) != Some(def_ebb) {
@@ -216,7 +216,7 @@ impl<'a> LivenessVerifier<'a> {
val, val,
ebb, ebb,
end end
) );
} }
}; };
@@ -247,7 +247,7 @@ impl<'a> LivenessVerifier<'a> {
"end of {} livein ({}) never reached", "end of {} livein ({}) never reached",
val, val,
end_ebb end_ebb
) );
} }
}; };
} }

2
lib/codegen/src/verifier/mod.rs
View File

@@ -1641,7 +1641,7 @@ impl<'a> Verifier<'a> {
"{} must have an encoding (e.g., {})", "{} must have an encoding (e.g., {})",
text, text,
isa.encoding_info().display(enc) isa.encoding_info().display(enc)
) );
} }
Err(_) => return nonfatal!(errors, inst, "{} must have an encoding", text), Err(_) => return nonfatal!(errors, inst, "{} must have an encoding", text),
} }

2
lib/filetests/src/test_binemit.rs
View File

@@ -186,7 +186,7 @@ impl SubTest for TestBinEmit {
return Err(format!( return Err(format!(
"'bin:' directive on non-inst {}: {}", "'bin:' directive on non-inst {}: {}",
comment.entity, comment.text comment.entity, comment.text
)) ));
} }
} }
} }

2
lib/filetests/src/test_domtree.rs
View File

@@ -55,7 +55,7 @@ impl SubTest for TestDomtree {
return Err(format!( return Err(format!(
"annotation on non-inst {}: {}", "annotation on non-inst {}: {}",
comment.entity, comment.text comment.entity, comment.text
)) ));
} }
}; };
for src_ebb in tail.split_whitespace() { for src_ebb in tail.split_whitespace() {

2
lib/reader/src/isaspec.rs
View File

@@ -56,7 +56,7 @@ where
"invalid setting value for '{}', expected {}", "invalid setting value for '{}', expected {}",
opt, opt,
expected expected
) );
} }
}, },
} }

10
lib/reader/src/parser.rs
View File

@@ -796,10 +796,10 @@ impl<'a> Parser<'a> {
}; };
let isa_builder = match isa::lookup(triple) { let isa_builder = match isa::lookup(triple) {
Err(isa::LookupError::SupportDisabled) => { Err(isa::LookupError::SupportDisabled) => {
return err!(loc, "support disabled target '{}'", targ) return err!(loc, "support disabled target '{}'", targ);
} }
Err(isa::LookupError::Unsupported) => { Err(isa::LookupError::Unsupported) => {
return err!(loc, "unsupported target '{}'", targ) return err!(loc, "unsupported target '{}'", targ);
} }
Ok(b) => b, Ok(b) => b,
}; };
@@ -859,7 +859,7 @@ impl<'a> Parser<'a> {
continue; continue;
} }
Err(isa::LookupError::Unsupported) => { Err(isa::LookupError::Unsupported) => {
return err!(loc, "unsupported target '{}'", target_name) return err!(loc, "unsupported target '{}'", target_name);
} }
Ok(b) => b, Ok(b) => b,
}; };
@@ -1480,7 +1480,7 @@ impl<'a> Parser<'a> {
Some(Token::SigRef(sig_src)) => { Some(Token::SigRef(sig_src)) => {
let sig = match SigRef::with_number(sig_src) { let sig = match SigRef::with_number(sig_src) {
None => { None => {
return err!(self.loc, "attempted to use invalid signature ss{}", sig_src) return err!(self.loc, "attempted to use invalid signature ss{}", sig_src);
} }
Some(sig) => sig, Some(sig) => sig,
}; };
@@ -1712,7 +1712,7 @@ impl<'a> Parser<'a> {
self.loc, self.loc,
"attempted to use invalid stack slot ss{}", "attempted to use invalid stack slot ss{}",
src_num src_num
) );
} }
Some(ss) => ss, Some(ss) => ss,
}; };