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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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