Browse Source

Rustfmt fixes

pull/3/head
Morgan Phillips 8 years ago
parent
commit
894d3796fb
  1. 6
      src/libcretonne/dominator_tree.rs
  2. 6
      src/libcretonne/ir/entities.rs
  3. 6
      src/libcretonne/ir/immediates.rs
  4. 5
      src/libcretonne/ir/instructions.rs
  5. 4
      src/libcretonne/settings.rs

6
src/libcretonne/dominator_tree.rs

@ -108,7 +108,11 @@ impl DominatorTree {
// TODO: we can't rely on instruction numbers to always be ordered
// from lowest to highest. Given that, it will be necessary to create
// an abolute mapping to determine the instruction order in the future.
if a.1 == NO_INST || a.1 < b.1 { a } else { b }
if a.1 == NO_INST || a.1 < b.1 {
a
} else {
b
}
}
/// Returns the immediate dominator of some ebb or None if the

6
src/libcretonne/ir/entities.rs

@ -42,7 +42,11 @@ impl EntityRef for Ebb {
impl Ebb {
/// Create a new EBB reference from its number. This corresponds to the ebbNN representation.
pub fn with_number(n: u32) -> Option<Ebb> {
if n < u32::MAX { Some(Ebb(n)) } else { None }
if n < u32::MAX {
Some(Ebb(n))
} else {
None
}
}
}

6
src/libcretonne/ir/immediates.rs

@ -60,7 +60,11 @@ impl FromStr for Imm64 {
let mut value: u64 = 0;
let mut digits = 0;
let negative = s.starts_with('-');
let s2 = if negative { &s[1..] } else { s };
let s2 = if negative {
&s[1..]
} else {
s
};
if s2.starts_with("0x") {
// Hexadecimal.

5
src/libcretonne/ir/instructions.rs

@ -95,7 +95,10 @@ impl FromStr for Opcode {
/// `Box<AuxData>` to store the additional information out of line.
#[derive(Debug)]
pub enum InstructionData {
Nullary { opcode: Opcode, ty: Type },
Nullary {
opcode: Opcode,
ty: Type,
},
Unary {
opcode: Opcode,
ty: Type,

4
src/libcretonne/settings.rs

@ -227,7 +227,9 @@ pub mod detail {
#[derive(Clone, Copy)]
pub enum Detail {
/// A boolean setting only uses one bit, numbered from LSB.
Bool { bit: u8 },
Bool {
bit: u8,
},
/// A numerical setting uses the whole byte.
Num,

Loading…
Cancel
Save