diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-06-26 00:39:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 00:39:17 -0700 |
| commit | 91a638d79447656d8af79e7baa6c7f31ad895b35 (patch) | |
| tree | cf4f04ebe8a032048d2461dac3e1ee4a44b06963 | |
| parent | 97ccd9706885d801990372fb88c4ab52817338b9 (diff) | |
| parent | 5c88b5172f3b00c838a1ce825f67d28f0ff01b65 (diff) | |
| download | rust-91a638d79447656d8af79e7baa6c7f31ad895b35.tar.gz rust-91a638d79447656d8af79e7baa6c7f31ad895b35.zip | |
Rollup merge of #73729 - nellshamrell:disable-collectionsbenches-android, r=sfackler
disable collectionbenches for android Fixes #73535 Signed-off-by: Nell Shamrell <nellshamrell@gmail.com>
| -rw-r--r-- | src/liballoc/benches/lib.rs | 3 | ||||
| -rw-r--r-- | src/tools/tidy/src/pal.rs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/liballoc/benches/lib.rs b/src/liballoc/benches/lib.rs index f31717d9fd5..608eafc88d2 100644 --- a/src/liballoc/benches/lib.rs +++ b/src/liballoc/benches/lib.rs @@ -1,3 +1,6 @@ +// Disabling on android for the time being +// See https://github.com/rust-lang/rust/issues/73535#event-3477699747 +#![cfg(not(target_os = "android"))] #![feature(btree_drain_filter)] #![feature(map_first_last)] #![feature(repr_simd)] diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 247e85603cf..7e77ae1db0d 100644 --- a/src/tools/tidy/src/pal.rs +++ b/src/tools/tidy/src/pal.rs @@ -67,6 +67,7 @@ const EXCEPTION_PATHS: &[&str] = &[ // std testing crates, okay for now at least "src/libcore/tests", "src/liballoc/tests/lib.rs", + "src/liballoc/benches/lib.rs", // The `VaList` implementation must have platform specific code. // The Windows implementation of a `va_list` is always a character // pointer regardless of the target architecture. As a result, |