diff options
| author | bors <bors@rust-lang.org> | 2024-03-21 02:09:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-21 02:09:07 +0000 |
| commit | 6a6cd6517dac28f9c3f0476e4ba436a2010e40d9 (patch) | |
| tree | a464ed772ae4650c1c1841a4904fcb7fde226395 /compiler/rustc_resolve/src | |
| parent | 6ec953c5ea63487a2e86b5b81555799bc438f741 (diff) | |
| parent | f25397adc0a143d28bd6a3fd57e441ef213c65b1 (diff) | |
| download | rust-6a6cd6517dac28f9c3f0476e4ba436a2010e40d9.tar.gz rust-6a6cd6517dac28f9c3f0476e4ba436a2010e40d9.zip | |
Auto merge of #122803 - jhpratt:rollup-nmgs79k, r=jhpratt
Rollup of 8 pull requests Successful merges: - #122545 (Ignore paths from expansion in `unused_qualifications`) - #122729 (Relax SeqCst ordering in standard library.) - #122740 (use more accurate terminology) - #122749 (make `type_flags(ReError) & HAS_ERROR`) - #122764 (coverage: Remove incorrect assertions from counter allocation) - #122765 (Add `usize::MAX` arg tests for Vec) - #122776 (Rename `hir::Let` into `hir::LetExpr`) - #122786 (compiletest: Introduce `remove_and_create_dir_all()` helper) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_resolve/src')
| -rw-r--r-- | compiler/rustc_resolve/src/late.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs index c661be3587e..fc037404829 100644 --- a/compiler/rustc_resolve/src/late.rs +++ b/compiler/rustc_resolve/src/late.rs @@ -4672,7 +4672,9 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> { return; } - if path.iter().any(|seg| seg.ident.span.from_expansion()) { + if finalize.path_span.from_expansion() + || path.iter().any(|seg| seg.ident.span.from_expansion()) + { return; } |