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

Update to the rustfmt in rust 1.27, which is now stable. (#377)

Browse Source
This commit is contained in:
Dan Gohman
2018-06-26 13:06:16 -07:00
committed by GitHub
parent 7d2b44289c
commit cc94adca3b
25 changed files with 134 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/frontend/src/frontend.rs
View File

@@ -3,10 +3,11 @@ use cretonne_codegen::cursor::{Cursor, FuncCursor};
use cretonne_codegen::entity::{EntityMap, EntityRef, EntitySet};
use cretonne_codegen::ir;
use cretonne_codegen::ir::function::DisplayFunction;
use cretonne_codegen::ir::{DataFlowGraph, Ebb, ExtFuncData, FuncRef, Function, GlobalValue,
GlobalValueData, Heap, HeapData, Inst, InstBuilderBase,
InstructionData, JumpTable, JumpTableData, SigRef, Signature,
StackSlot, StackSlotData, Type, Value};
use cretonne_codegen::ir::{
DataFlowGraph, Ebb, ExtFuncData, FuncRef, Function, GlobalValue, GlobalValueData, Heap,
HeapData, Inst, InstBuilderBase, InstructionData, JumpTable, JumpTableData, SigRef, Signature,
StackSlot, StackSlotData, Type, Value,
};
use cretonne_codegen::isa::TargetIsa;
use cretonne_codegen::packed_option::PackedOption;
use ssa::{Block, SSABuilder, SideEffects};
@@ -273,7 +274,9 @@ where
pub fn switch_to_block(&mut self, ebb: Ebb) {
// First we check that the previous block has been filled.
debug_assert!(
self.position.is_default() || self.is_unreachable() || self.is_pristine()
self.position.is_default()
|| self.is_unreachable()
|| self.is_pristine()
|| self.is_filled(),
"you have to fill your block before switching"
);

7
lib/frontend/src/ssa.rs
View File

@@ -172,8 +172,11 @@ where
/// Tests whether an `SSABuilder` is in a cleared state.
pub fn is_empty(&self) -> bool {
self.variables.is_empty() && self.blocks.is_empty() && self.ebb_headers.is_empty()
&& self.calls.is_empty() && self.results.is_empty()
self.variables.is_empty()
&& self.blocks.is_empty()
&& self.ebb_headers.is_empty()
&& self.calls.is_empty()
&& self.results.is_empty()
&& self.side_effects.is_empty()
}
}