diff options
| author | bors <bors@rust-lang.org> | 2021-03-26 04:10:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-26 04:10:13 +0000 |
| commit | 7637fd588bfee93d627474a18dcbf11a81803665 (patch) | |
| tree | f27d975515727ef5279c2650b088fda0f2a4872e /src/test/codegen/alloc-optimisation.rs | |
| parent | 0ced530534de1a77504b6229e6303d37a12282ee (diff) | |
| parent | b0bec9553429639fc20dcc224f7525d99c325655 (diff) | |
| download | rust-7637fd588bfee93d627474a18dcbf11a81803665.tar.gz rust-7637fd588bfee93d627474a18dcbf11a81803665.zip | |
Auto merge of #83503 - Dylan-DPC:rollup-mqvjfav, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #83055 ([rustdoc] Don't document stripped items in JSON renderer.) - #83437 (Refactor #82270 as lint instead of an error) - #83444 (Fix bootstrap tests on beta) - #83456 (Add docs for Vec::from functions) - #83463 (ExitStatusExt: Fix missing word in two docs messages) - #83470 (Fix patch note about #80653 not mentioning nested nor recursive) - #83485 (Mark asm tests as requiring LLVM 10.0.1) - #83486 (Don't ICE when using `#[global_alloc]` on a non-item statement) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/codegen/alloc-optimisation.rs')
| -rw-r--r-- | src/test/codegen/alloc-optimisation.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/codegen/alloc-optimisation.rs b/src/test/codegen/alloc-optimisation.rs index c3ffaeb9547..5b27f3f4545 100644 --- a/src/test/codegen/alloc-optimisation.rs +++ b/src/test/codegen/alloc-optimisation.rs @@ -1,5 +1,5 @@ // -// no-system-llvm +// min-llvm-version: 10.0.1 // compile-flags: -O #![crate_type="lib"] |