Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8556e66

Browse files
committedAug 16, 2022
Auto merge of #100611 - matthiaskrgr:rollup-rxj10ur, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #100338 (when there are 3 or more return statements in the loop) - #100384 (Add support for generating unique profraw files by default when using `-C instrument-coverage`) - #100460 (Update the minimum external LLVM to 13) - #100567 (Add missing closing quote) - #100590 (Suggest adding an array length if possible) - #100600 (Rename Machine memory hooks to suggest when they run) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents ef9810a + 88af506 commit 8556e66

File tree

50 files changed

+318
-335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+318
-335
lines changed
 

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: mingw-check
4444
os: ubuntu-20.04-xl
4545
env: {}
46-
- name: x86_64-gnu-llvm-12
46+
- name: x86_64-gnu-llvm-13
4747
os: ubuntu-20.04-xl
4848
env: {}
4949
- name: x86_64-gnu-tools
@@ -274,11 +274,11 @@ jobs:
274274
- name: x86_64-gnu-distcheck
275275
os: ubuntu-20.04-xl
276276
env: {}
277-
- name: x86_64-gnu-llvm-12
277+
- name: x86_64-gnu-llvm-13
278278
env:
279279
RUST_BACKTRACE: 1
280280
os: ubuntu-20.04-xl
281-
- name: x86_64-gnu-llvm-12-stage1
281+
- name: x86_64-gnu-llvm-13-stage1
282282
env:
283283
RUST_BACKTRACE: 1
284284
os: ubuntu-20.04-xl

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use rustc_data_structures::fx::FxHashMap;
4848
use rustc_data_structures::sorted_map::SortedMap;
4949
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
5050
use rustc_data_structures::sync::Lrc;
51-
use rustc_errors::{struct_span_err, Applicability, Handler};
51+
use rustc_errors::{struct_span_err, Applicability, Handler, StashKey};
5252
use rustc_hir as hir;
5353
use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
5454
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
@@ -2233,7 +2233,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
22332233
c.value.span,
22342234
"using `_` for array lengths is unstable",
22352235
)
2236-
.emit();
2236+
.stash(c.value.span, StashKey::UnderscoreForArrayLengths);
22372237
hir::ArrayLen::Body(self.lower_anon_const(c))
22382238
}
22392239
}

0 commit comments

Comments
 (0)
Please sign in to comment.