diff options
| author | Ralf Jung <post@ralfj.de> | 2017-09-08 09:40:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 09:40:19 +0200 |
| commit | 2c4fcd8d12a0adb4278856377e03180c6c0b7edc (patch) | |
| tree | 7c1b0e255a83d98689e653d64bfa0f858ba36023 | |
| parent | b456b7cc8dcee30a754a2f67694d5cd85b171bcf (diff) | |
| parent | 5570a78c51d747e22072326e0276e1861fd00beb (diff) | |
| download | rust-2c4fcd8d12a0adb4278856377e03180c6c0b7edc.tar.gz rust-2c4fcd8d12a0adb4278856377e03180c6c0b7edc.zip | |
Merge pull request #329 from solson/oli-obk-patch-2
Rustup
| -rw-r--r-- | tests/run-pass-fullmir/u128.rs | 2 | ||||
| -rw-r--r-- | tests/run-pass-fullmir/unsized-tuple-impls.rs | 2 | ||||
| -rw-r--r-- | tests/run-pass/pointers.rs | 2 | ||||
| -rw-r--r-- | xargo/Xargo.toml | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/tests/run-pass-fullmir/u128.rs b/tests/run-pass-fullmir/u128.rs index a05308acbe6..a1fb96ef4a6 100644 --- a/tests/run-pass-fullmir/u128.rs +++ b/tests/run-pass-fullmir/u128.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// compile-flags: -Zmir-emit-validate=0 + #![feature(i128_type)] fn b<T>(t: T) -> T { t } diff --git a/tests/run-pass-fullmir/unsized-tuple-impls.rs b/tests/run-pass-fullmir/unsized-tuple-impls.rs index ccb6883e873..acaedebbf9b 100644 --- a/tests/run-pass-fullmir/unsized-tuple-impls.rs +++ b/tests/run-pass-fullmir/unsized-tuple-impls.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// compile-flags: -Zmir-emit-validate=0 + #![feature(unsized_tuple_coercion)] use std::mem; diff --git a/tests/run-pass/pointers.rs b/tests/run-pass/pointers.rs index f3ae3ab913a..7d34d564ea4 100644 --- a/tests/run-pass/pointers.rs +++ b/tests/run-pass/pointers.rs @@ -1,3 +1,5 @@ +// compile-flags: -Zmir-emit-validate=0 + fn one_line_ref() -> i16 { *&1 } diff --git a/xargo/Xargo.toml b/xargo/Xargo.toml index 32f45c4a981..4b650b97de5 100644 --- a/xargo/Xargo.toml +++ b/xargo/Xargo.toml @@ -1,2 +1,2 @@ [dependencies] -std = {features = ["panic_unwind", "jemalloc"]} +std = {features = ["panic_unwind", "jemalloc", "backtrace"]} |