squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rustfmt

Browse source
This commit is contained in:
bjorn3 2018-08-17 13:01:56 +02:00
parent f27dfc3ac9
commit 7a3ba963e1
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/base.rs
View file

@ -9,7 +9,10 @@ impl Drop for PrintOnPanic {
} }
} }
pub fn trans_mono_item<'a, 'tcx: 'a>(cx: &mut CodegenCx<'a, 'tcx, impl Backend>, mono_item: MonoItem<'tcx>) { pub fn trans_mono_item<'a, 'tcx: 'a>(
cx: &mut CodegenCx<'a, 'tcx, impl Backend>,
mono_item: MonoItem<'tcx>,
) {
let tcx = cx.tcx; let tcx = cx.tcx;
let context = &mut cx.context; let context = &mut cx.context;

32
src/lib.rs
View file

@ -68,7 +68,11 @@ mod prelude {
self, subst::Substs, FnSig, Instance, InstanceDef, ParamEnv, PolyFnSig, Ty, TyCtxt, self, subst::Substs, FnSig, Instance, InstanceDef, ParamEnv, PolyFnSig, Ty, TyCtxt,
TypeAndMut, TypeFoldable, TypeVariants, TypeAndMut, TypeFoldable, TypeVariants,
}; };
pub use rustc_data_structures::{fx::{FxHashSet, FxHashMap}, indexed_vec::Idx, sync::Lrc}; pub use rustc_data_structures::{
fx::{FxHashMap, FxHashSet},
indexed_vec::Idx,
sync::Lrc,
};
pub use rustc_mir::monomorphize::{collector, MonoItem}; pub use rustc_mir::monomorphize::{collector, MonoItem};
pub use syntax::ast::{FloatTy, IntTy, UintTy}; pub use syntax::ast::{FloatTy, IntTy, UintTy};
pub use syntax::codemap::DUMMY_SP; pub use syntax::codemap::DUMMY_SP;
@ -215,9 +219,8 @@ impl CodegenBackend for CraneliftCodegenBackend {
.finish(flags); .finish(flags);
let mono_items = let mono_items =
collector::collect_crate_mono_items(tcx, collector::MonoItemCollectionMode::Eager) collector::collect_crate_mono_items(tcx, collector::MonoItemCollectionMode::Eager).0;
.0;
// TODO: move to the end of this function when compiling libcore doesn't have unimplemented stuff anymore // TODO: move to the end of this function when compiling libcore doesn't have unimplemented stuff anymore
save_incremental(tcx); save_incremental(tcx);
tcx.sess.warn("Saved incremental data"); tcx.sess.warn("Saved incremental data");
@ -252,13 +255,14 @@ impl CodegenBackend for CraneliftCodegenBackend {
::std::process::exit(0); ::std::process::exit(0);
} else { } else {
let mut faerie_module: Module<FaerieBackend> = Module::new( let mut faerie_module: Module<FaerieBackend> = Module::new(
FaerieBuilder::new( FaerieBuilder::new(
isa, isa,
"some_file.o".to_string(), "some_file.o".to_string(),
FaerieTrapCollection::Disabled, FaerieTrapCollection::Disabled,
FaerieBuilder::default_libcall_names(), FaerieBuilder::default_libcall_names(),
).unwrap()); ).unwrap(),
);
codegen_mono_items(tcx, &mut faerie_module, &mono_items); codegen_mono_items(tcx, &mut faerie_module, &mono_items);
tcx.sess.abort_if_errors(); tcx.sess.abort_if_errors();
@ -340,7 +344,11 @@ impl CodegenBackend for CraneliftCodegenBackend {
} }
} }
fn codegen_mono_items<'a, 'tcx: 'a>(tcx: TyCtxt<'a, 'tcx, 'tcx>, module: &mut Module<impl Backend + 'static>, mono_items: &FxHashSet<MonoItem<'tcx>>) { fn codegen_mono_items<'a, 'tcx: 'a>(
tcx: TyCtxt<'a, 'tcx, 'tcx>,
module: &mut Module<impl Backend + 'static>,
mono_items: &FxHashSet<MonoItem<'tcx>>,
) {
use std::io::Write; use std::io::Write;
let mut cx = CodegenCx { let mut cx = CodegenCx {