mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generator return doesn't need to be a lang item

Browse Source
This commit is contained in:
Michael Goulet 2022-09-08 02:34:22 +00:00
parent c2804e6ec2
commit 2c94102df5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_hir/src/lang_items.rs
View File

@ -238,7 +238,6 @@ language_item_table! {
Future, sym::future_trait, future_trait, Target::Trait, GenericRequirement::Exact(0); Future, sym::future_trait, future_trait, Target::Trait, GenericRequirement::Exact(0);
GeneratorState, sym::generator_state, gen_state, Target::Enum, GenericRequirement::None; GeneratorState, sym::generator_state, gen_state, Target::Enum, GenericRequirement::None;
Generator, sym::generator, gen_trait, Target::Trait, GenericRequirement::Minimum(1); Generator, sym::generator, gen_trait, Target::Trait, GenericRequirement::Minimum(1);
GeneratorReturn, sym::generator_return, generator_return, Target::AssocTy, GenericRequirement::None;
Unpin, sym::unpin, unpin_trait, Target::Trait, GenericRequirement::None; Unpin, sym::unpin, unpin_trait, Target::Trait, GenericRequirement::None;
Pin, sym::pin, pin_type, Target::Struct, GenericRequirement::None; Pin, sym::pin, pin_type, Target::Struct, GenericRequirement::None;

6
compiler/rustc_middle/src/ty/print/pretty.rs
View File

@ -916,8 +916,10 @@ pub trait PrettyPrinter<'tcx>:
// Skip printing `<[generator@] as Generator<_>>::Return` from async blocks, // Skip printing `<[generator@] as Generator<_>>::Return` from async blocks,
// unless we can find out what generator return type it comes from. // unless we can find out what generator return type it comes from.
let term = if let Some(ty) = term.skip_binder().ty() let term = if let Some(ty) = term.skip_binder().ty()
&& let ty::Projection(ty::ProjectionTy { item_def_id, substs }) = ty.kind() && let ty::Projection(proj) = ty.kind()
&& Some(*item_def_id) == tcx.lang_items().generator_return() && let assoc = tcx.associated_item(proj.item_def_id)
&& assoc.trait_container(tcx) == tcx.lang_items().gen_trait()
&& assoc.name == rustc_span::sym::Return
{ {
if let ty::Generator(_, substs, _) = substs.type_at(0).kind() { if let ty::Generator(_, substs, _) = substs.type_at(0).kind() {
let return_ty = substs.as_generator().return_ty(); let return_ty = substs.as_generator().return_ty();

1
compiler/rustc_span/src/symbol.rs
View File

@ -763,7 +763,6 @@ symbols! {
gen_future, gen_future,
gen_kill, gen_kill,
generator, generator,
generator_return,
generator_state, generator_state,
generators, generators,
generic_arg_infer, generic_arg_infer,

2
library/core/src/ops/generator.rs
View File

@ -83,7 +83,7 @@ pub trait Generator<R = ()> {
/// `return` statement or implicitly as the last expression of a generator /// `return` statement or implicitly as the last expression of a generator
/// literal. For example futures would use this as `Result<T, E>` as it /// literal. For example futures would use this as `Result<T, E>` as it
/// represents a completed future. /// represents a completed future.
#[lang = "generator_return"] #[cfg_attr(bootstrap, lang = "generator_return")]
type Return; type Return;
/// Resumes the execution of this generator. /// Resumes the execution of this generator.