Skip to content

Commit

Permalink
Auto merge of rust-lang#131098 - GuillaumeGomez:rollup-kk74was, r=Gui…
Browse files Browse the repository at this point in the history
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#130630 (Support clobber_abi and vector/access registers (clobber-only) in s390x inline assembly)
 - rust-lang#131042 (Instantiate binders in `supertrait_vtable_slot`)
 - rust-lang#131079 (Update wasm-component-ld to 0.5.9)
 - rust-lang#131085 (make test_lots_of_insertions test take less long in Miri)
 - rust-lang#131088 (add fixme to remove LLVM_ENABLE_TERMINFO when minimal llvm version is 19)

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Oct 1, 2024
2 parents 90d63b1 + 3a8939e commit bcfd953
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion std/src/collections/hash/map/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ fn test_lots_of_insertions() {
for _ in 0..loops {
assert!(m.is_empty());

let count = if cfg!(miri) { 101 } else { 1001 };
let count = if cfg!(miri) { 66 } else { 1001 };

for i in 1..count {
assert!(m.insert(i, i).is_none());
Expand Down

0 comments on commit bcfd953

Please sign in to comment.