diff options
| author | bors <bors@rust-lang.org> | 2020-06-26 10:11:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-26 10:11:43 +0000 |
| commit | 9672b5e95c520774cc17bffc7031c80a1bcf4b4c (patch) | |
| tree | 20f7538c7a80d21a50268d6ca69e42250be2010d /src/liballoc | |
| parent | 14e65d5e95da0f7e4f9127cf1598fa46f33972e8 (diff) | |
| parent | a7eee3cca03749b8f5ef38ad5f7b601d27757718 (diff) | |
| download | rust-9672b5e95c520774cc17bffc7031c80a1bcf4b4c.tar.gz rust-9672b5e95c520774cc17bffc7031c80a1bcf4b4c.zip | |
Auto merge of #73756 - Manishearth:rollup-aehswb2, r=Manishearth
Rollup of 13 pull requests Successful merges: - #72620 (Omit DW_AT_linkage_name when it is the same as DW_AT_name) - #72967 (Don't move cursor in search box when using arrows to navigate results) - #73102 (proc_macro: Stop flattening groups with dummy spans) - #73297 (Support configurable deny-warnings for all in-tree crates.) - #73507 (Cleanup MinGW LLVM linkage workaround) - #73588 (Fix handling of reserved registers for ARM inline asm) - #73597 (Record span of `const` kw in GenericParamKind) - #73629 (Make AssocOp Copy) - #73681 (Update Chalk to 0.14) - #73707 (Fix links in `SliceIndex` documentation) - #73719 (emitter: column width defaults to 140) - #73729 (disable collectionbenches for android) - #73748 (Add code block to code in documentation of `List::rebase_onto`) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/benches/lib.rs | 3 |
1 files changed, 3 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)] |