From c080c0bfec41e883e019e49de9b4b0cc35a4ff59 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 3 Nov 2018 15:04:27 +0100
Subject: [PATCH] Misc changes
---
build.sh | 3 ++-
src/lib.rs | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.sh b/build.sh
index b77536bf329..6bbf024044b 100755
--- a/build.sh
+++ b/build.sh
@@ -30,6 +30,7 @@ else
fi
export RUSTFLAGS='-Zalways-encode-mir -Cpanic=abort -Zcodegen-backend='$(pwd)'/target/'$channel'/librustc_codegen_cranelift.'$dylib_ext
+export XARGO_RUST_SRC=$(pwd)'/target/libcore/src'
RUSTC="rustc $RUSTFLAGS -L crate=target/out --out-dir target/out"
rm -r target/out || true
@@ -52,7 +53,7 @@ time $RUSTC target/libcore/src/libcore/lib.rs --crate-type lib --crate-name core
pushd xargo
rm -r ~/.xargo/HOST || true
-export XARGO_RUST_SRC=$(pwd)'/../target/libcore/src'
+rm -r target || true
time xargo build --color always
popd
diff --git a/src/lib.rs b/src/lib.rs
index 9e7e527e98d..0ce01e1f51e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -197,7 +197,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
let mut jit_module: Module<SimpleJITBackend> = Module::new(SimpleJITBuilder::new());
assert_eq!(pointer_ty(tcx), jit_module.target_config().pointer_type());
- codegen_mono_items(tcx, &mut jit_module, &mono_items);
+ codegen_mono_items(tcx, &mut jit_module, mono_items);
tcx.sess.abort_if_errors();
println!("Compiled everything");
@@ -238,7 +238,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
);
assert_eq!(pointer_ty(tcx), faerie_module.target_config().pointer_type());
- codegen_mono_items(tcx, &mut faerie_module, &mono_items);
+ codegen_mono_items(tcx, &mut faerie_module, mono_items);
tcx.sess.abort_if_errors();
@@ -342,7 +342,7 @@ 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>>,
+ mono_items: FxHashSet<MonoItem<'tcx>>,
) {
use std::io::Write;
@@ -363,7 +363,7 @@ fn codegen_mono_items<'a, 'tcx: 'a>(
for mono_item in mono_items {
let res = ::std::panic::catch_unwind(::std::panic::AssertUnwindSafe(|| {
- base::trans_mono_item(tcx, module, &mut caches, &mut ccx, *mono_item);
+ base::trans_mono_item(tcx, module, &mut caches, &mut ccx, mono_item);
}));
if let Err(err) = res {