Format with stable rustfmt-preview, then with rustfmt-0.9 again.

This commit is contained in:
Dan Gohman
2018-03-30 13:17:15 -07:00
parent d7c66a8ec1
commit 8d5fecd324
127 changed files with 381 additions and 479 deletions

View File

@@ -13,7 +13,7 @@ use cretonne::ir::entities::AnyEntity;
use cretonne::binemit::RegDiversions;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result};
use subtest::{Context, Result, SubTest};
use match_directive::match_directive;
struct TestBinEmit;
@@ -43,8 +43,6 @@ impl TextSink {
}
}
impl binemit::CodeSink for TextSink {
fn offset(&self) -> binemit::CodeOffset {
self.offset
@@ -80,23 +78,11 @@ impl binemit::CodeSink for TextSink {
name: &ir::ExternalName,
addend: binemit::Addend,
) {
write!(
self.text,
"{}({}",
reloc,
name,
).unwrap();
write!(self.text, "{}({}", reloc, name,).unwrap();
if addend != 0 {
write!(
self.text,
"{:+}",
addend,
).unwrap();
write!(self.text, "{:+}", addend,).unwrap();
}
write!(
self.text,
") ",
).unwrap();
write!(self.text, ") ",).unwrap();
}
fn reloc_jt(&mut self, reloc: binemit::Reloc, jt: ir::JumpTable) {
@@ -278,10 +264,10 @@ impl SubTest for TestBinEmit {
));
}
return Err(format!(
"No matching encodings for {} in {}",
func.dfg.display_inst(inst, isa),
DisplayList(&encodings),
));
"No matching encodings for {} in {}",
func.dfg.display_inst(inst, isa),
DisplayList(&encodings),
));
}
let have = sink.text.trim();
if have != want {