Skip to content

Commit 0b45675

Browse files
committedMar 31, 2025·
Auto merge of #139169 - matthiaskrgr:rollup-nfy4aew, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #138176 (Prefer built-in sized impls (and only sized impls) for rigid types always) - #138749 (Fix closure recovery for missing block when return type is specified) - #138842 (Emit `unused_attributes` for `#[inline]` on exported functions) - #139153 (Encode synthetic by-move coroutine body with a different `DefPathData`) - #139157 (Remove mention of `exhaustive_patterns` from `never` docs) - #139167 (Remove Amanieu from the libs review rotation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ab5b1be + 70a1bbc commit 0b45675

File tree

43 files changed

+478
-73
lines changed

Some content is hidden

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

43 files changed

+478
-73
lines changed
 

‎compiler/rustc_hir/src/def.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ impl DefKind {
294294
DefKind::GlobalAsm => DefPathData::GlobalAsm,
295295
DefKind::Impl { .. } => DefPathData::Impl,
296296
DefKind::Closure => DefPathData::Closure,
297-
DefKind::SyntheticCoroutineBody => DefPathData::Closure,
297+
DefKind::SyntheticCoroutineBody => DefPathData::SyntheticCoroutineBody,
298298
}
299299
}
300300

‎compiler/rustc_hir/src/definitions.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ pub enum DefPathData {
291291
/// An existential `impl Trait` type node.
292292
/// Argument position `impl Trait` have a `TypeNs` with their pretty-printed name.
293293
OpaqueTy,
294+
/// A synthetic body for a coroutine's by-move body.
295+
SyntheticCoroutineBody,
294296
}
295297

296298
impl Definitions {
@@ -415,8 +417,16 @@ impl DefPathData {
415417

416418
ValueNs(name) | MacroNs(name) | LifetimeNs(name) => Some(name),
417419

418-
Impl | ForeignMod | CrateRoot | Use | GlobalAsm | Closure | Ctor | AnonConst
419-
| OpaqueTy => None,
420+
Impl
421+
| ForeignMod
422+
| CrateRoot
423+
| Use
424+
| GlobalAsm
425+
| Closure
426+
| Ctor
427+
| AnonConst
428+
| OpaqueTy
429+
| SyntheticCoroutineBody => None,
420430
}
421431
}
422432

@@ -441,6 +451,7 @@ impl DefPathData {
441451
Ctor => DefPathDataName::Anon { namespace: sym::constructor },
442452
AnonConst => DefPathDataName::Anon { namespace: sym::constant },
443453
OpaqueTy => DefPathDataName::Anon { namespace: sym::opaque },
454+
SyntheticCoroutineBody => DefPathDataName::Anon { namespace: sym::synthetic },
444455
}
445456
}
446457
}

0 commit comments

Comments
 (0)
Please sign in to comment.