about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2019-02-06 19:07:21 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2019-02-06 19:07:21 +0100
commitc6bf784d39bbc782137a6c79a672d18ea5235029 (patch)
treefc7d8f5849a0ffb95d5f04035fb5f122d02faef8
parent43f4dc622054d7794c0e86cf8203ec294534c66c (diff)
downloadrust-c6bf784d39bbc782137a6c79a672d18ea5235029.tar.gz
rust-c6bf784d39bbc782137a6c79a672d18ea5235029.zip
Misc changes
-rwxr-xr-xbuild_sysroot/build_sysroot.sh1
-rw-r--r--src/abi.rs3
2 files changed, 1 insertions, 3 deletions
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 2e332be7e60..33da1e3dd67 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -6,7 +6,6 @@ cd $(dirname "$0")
 cargo clean
 rm Cargo.lock 2>/dev/null || true
 rm -r sysroot 2>/dev/null || true
-rm -r target 2>/dev/null || true
 
 # FIXME find a better way to get the target triple
 unamestr=`uname`
diff --git a/src/abi.rs b/src/abi.rs
index 0045866dfdd..3093ad69eb9 100644
--- a/src/abi.rs
+++ b/src/abi.rs
@@ -356,8 +356,7 @@ fn local_place<'a, 'tcx: 'a>(
                     local, ty, size.bytes(), align.abi.bytes(), align.pref.bytes(),
                 )),
                 _ => unreachable!(),
-            };
-
+            }
         }
 
         // Take stack_addr in advance to avoid many duplicate instructions