Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d31b6fb

Browse files
committedMar 18, 2024
Auto merge of rust-lang#122690 - matthiaskrgr:rollup-43fggl0, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#122480 (Avoid various uses of `Option<Span>` in favor of using `DUMMY_SP` in the few cases that used `None`) - rust-lang#122567 (Remove fixme about LLVM basic block naming) - rust-lang#122588 (less useless filter calls in imported_source_file) - rust-lang#122647 (add_retag: ensure box-to-raw-ptr casts are preserved for Miri) - rust-lang#122649 (Update the minimum external LLVM to 17) - rust-lang#122680 (Do not eat nested expressions' results in `MayContainYieldPoint` format args visitor) - rust-lang#122683 (add missing test: expected paren or brace in macro) - rust-lang#122689 (Add missing `try_visit` calls in visitors.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3cdcdaf + 9011e67 commit d31b6fb

File tree

75 files changed

+241
-365
lines changed

Some content is hidden

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

75 files changed

+241
-365
lines changed
 

‎.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: mingw-check-tidy
5959
os: ubuntu-20.04-4core-16gb
6060
env: {}
61-
- name: x86_64-gnu-llvm-16
61+
- name: x86_64-gnu-llvm-17
6262
env:
6363
ENABLE_GCC_CODEGEN: "1"
6464
os: ubuntu-20.04-16core-64gb
@@ -323,10 +323,6 @@ jobs:
323323
env:
324324
RUST_BACKTRACE: 1
325325
os: ubuntu-20.04-8core-32gb
326-
- name: x86_64-gnu-llvm-16
327-
env:
328-
RUST_BACKTRACE: 1
329-
os: ubuntu-20.04-8core-32gb
330326
- name: x86_64-gnu-nopt
331327
os: ubuntu-20.04-4core-16gb
332328
env: {}

‎compiler/rustc_ast/src/visit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(
755755
}
756756
AssocItemKind::Delegation(box Delegation { id, qself, path, body }) => {
757757
if let Some(qself) = qself {
758-
visitor.visit_ty(&qself.ty);
758+
try_visit!(visitor.visit_ty(&qself.ty));
759759
}
760760
try_visit!(visitor.visit_path(path, *id));
761761
visit_opt!(visitor, visit_block, body);
@@ -994,7 +994,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) -> V
994994
ExprKind::InlineAsm(asm) => try_visit!(visitor.visit_inline_asm(asm)),
995995
ExprKind::FormatArgs(f) => try_visit!(visitor.visit_format_args(f)),
996996
ExprKind::OffsetOf(container, fields) => {
997-
visitor.visit_ty(container);
997+
try_visit!(visitor.visit_ty(container));
998998
walk_list!(visitor, visit_ident, fields.iter().copied());
999999
}
10001000
ExprKind::Yield(optional_expression) => {

0 commit comments

Comments
 (0)
This repository has been archived.