Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 79a272c

Browse files
committedApr 17, 2025·
Auto merge of rust-lang#139938 - matthiaskrgr:rollup-19ddpus, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#139084 (hygiene: Rename semi-transparent to semi-opaque) - rust-lang#139236 (Use a session counter to make anon dep nodes unique) - rust-lang#139650 (Fix `register_group_alias` for tools) - rust-lang#139770 (Rename `LifetimeName` as `LifetimeKind`.) - rust-lang#139846 (Remove `kw::Empty` uses in rustdoc) - rust-lang#139891 (Include optional dso_local marker for functions in `enum-match.rs`) - rust-lang#139908 (parser: Remove old diagnostic notes for type ascription syntax) - rust-lang#139917 (fix for multiple `#[repr(align(N))]` on functions) Failed merges: - rust-lang#139615 (Remove `name_or_empty`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3920514 + cbe469a commit 79a272c

File tree

66 files changed

+265
-302
lines changed

Some content is hidden

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

66 files changed

+265
-302
lines changed
 

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,21 +1767,21 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
17671767
) -> &'hir hir::Lifetime {
17681768
let res = self.resolver.get_lifetime_res(id).unwrap_or(LifetimeRes::Error);
17691769
let res = match res {
1770-
LifetimeRes::Param { param, .. } => hir::LifetimeName::Param(param),
1770+
LifetimeRes::Param { param, .. } => hir::LifetimeKind::Param(param),
17711771
LifetimeRes::Fresh { param, .. } => {
17721772
debug_assert_eq!(ident.name, kw::UnderscoreLifetime);
17731773
let param = self.local_def_id(param);
1774-
hir::LifetimeName::Param(param)
1774+
hir::LifetimeKind::Param(param)
17751775
}
17761776
LifetimeRes::Infer => {
17771777
debug_assert_eq!(ident.name, kw::UnderscoreLifetime);
1778-
hir::LifetimeName::Infer
1778+
hir::LifetimeKind::Infer
17791779
}
17801780
LifetimeRes::Static { .. } => {
17811781
debug_assert!(matches!(ident.name, kw::StaticLifetime | kw::UnderscoreLifetime));
1782-
hir::LifetimeName::Static
1782+
hir::LifetimeKind::Static
17831783
}
1784-
LifetimeRes::Error => hir::LifetimeName::Error,
1784+
LifetimeRes::Error => hir::LifetimeKind::Error,
17851785
LifetimeRes::ElidedAnchor { .. } => {
17861786
panic!("Unexpected `ElidedAnchar` {:?} at {:?}", ident, ident.span);
17871787
}
@@ -2388,7 +2388,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23882388
let r = hir::Lifetime::new(
23892389
self.next_id(),
23902390
Ident::new(kw::UnderscoreLifetime, self.lower_span(span)),
2391-
hir::LifetimeName::ImplicitObjectLifetimeDefault,
2391+
hir::LifetimeKind::ImplicitObjectLifetimeDefault,
23922392
IsAnonInPath::No,
23932393
);
23942394
debug!("elided_dyn_bound: r={:?}", r);

‎compiler/rustc_attr_parsing/src/attributes/transparency.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl SingleAttributeParser for TransparencyParser {
2020
fn convert(cx: &AcceptContext<'_>, args: &ArgParser<'_>) -> Option<AttributeKind> {
2121
match args.name_value().and_then(|nv| nv.value_as_str()) {
2222
Some(sym::transparent) => Some(Transparency::Transparent),
23-
Some(sym::semitransparent) => Some(Transparency::SemiTransparent),
23+
Some(sym::semiopaque | sym::semitransparent) => Some(Transparency::SemiOpaque),
2424
Some(sym::opaque) => Some(Transparency::Opaque),
2525
Some(other) => {
2626
cx.dcx().span_err(cx.attr_span, format!("unknown macro transparency: `{other}`"));

0 commit comments

Comments
 (0)
This repository has been archived.