Skip to content

Commit

Permalink
Rollup merge of #73729 - nellshamrell:disable-collectionsbenches-andr…
Browse files Browse the repository at this point in the history
…oid, r=sfackler

disable collectionbenches for android

Fixes #73535

Signed-off-by: Nell Shamrell <nellshamrell@gmail.com>
  • Loading branch information
Manishearth authored Jun 26, 2020
2 parents 97ccd97 + 5c88b51 commit 91a638d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/liballoc/benches/lib.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
1 change: 1 addition & 0 deletions src/tools/tidy/src/pal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 91a638d

Please sign in to comment.