diff options
| author | bors <bors@rust-lang.org> | 2025-04-17 01:38:17 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-17 01:38:17 +0000 | 
| commit | 79a272c6402e0ac0aed17c647c4f709479e67a30 (patch) | |
| tree | 0ec5a29258fdf48b95a9344cd0953cdea4ee0c5f /compiler/rustc_resolve/src/lib.rs | |
| parent | 3920514036f59b5596133707a425f1b8a1c20815 (diff) | |
| parent | cbe469a8b11e43e82640b0821385bf7dc9eb6d38 (diff) | |
| download | rust-79a272c6402e0ac0aed17c647c4f709479e67a30.tar.gz rust-79a272c6402e0ac0aed17c647c4f709479e67a30.zip | |
Auto merge of #139938 - matthiaskrgr:rollup-19ddpus, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #139084 (hygiene: Rename semi-transparent to semi-opaque) - #139236 (Use a session counter to make anon dep nodes unique) - #139650 (Fix `register_group_alias` for tools) - #139770 (Rename `LifetimeName` as `LifetimeKind`.) - #139846 (Remove `kw::Empty` uses in rustdoc) - #139891 (Include optional dso_local marker for functions in `enum-match.rs`) - #139908 (parser: Remove old diagnostic notes for type ascription syntax) - #139917 (fix for multiple `#[repr(align(N))]` on functions) Failed merges: - #139615 (Remove `name_or_empty`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_resolve/src/lib.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/lib.rs | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index a92912c9639..b121755acd9 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -2007,16 +2007,16 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { result, result.map(|r| r.expn_data()) ); - // Then find the last semi-transparent mark from the end if it exists. + // Then find the last semi-opaque mark from the end if it exists. for (mark, transparency) in iter { - if transparency == Transparency::SemiTransparent { + if transparency == Transparency::SemiOpaque { result = Some(mark); } else { break; } } debug!( - "resolve_crate_root: found semi-transparent mark {:?} {:?}", + "resolve_crate_root: found semi-opaque mark {:?} {:?}", result, result.map(|r| r.expn_data()) ); | 
