bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Move fn parameter ribs outwards.

Browse source
This commit is contained in:
Camille GILLOT 2022-05-22 23:31:39 +02:00
parent ae70e366f3
commit 267d3620a5
1 changed files with 62 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

98
compiler/rustc_resolve/src/late.rs
View file

@ -695,14 +695,25 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
}, },
|this| { |this| {
this.visit_generic_params(&bare_fn.generic_params, false); this.visit_generic_params(&bare_fn.generic_params, false);
this.resolve_fn_signature( this.with_lifetime_rib(
ty.id, LifetimeRibKind::AnonymousCreateParameter {
None, binder: ty.id,
false, report_in_path: false,
// We don't need to deal with patterns in parameters, because },
// they are not possible for foreign or bodiless functions. |this| {
bare_fn.decl.inputs.iter().map(|Param { ty, .. }| (None, &**ty)), this.resolve_fn_signature(
&bare_fn.decl.output, ty.id,
false,
// We don't need to deal with patterns in parameters, because
// they are not possible for foreign or bodiless functions.
bare_fn
.decl
.inputs
.iter()
.map(|Param { ty, .. }| (None, &**ty)),
&bare_fn.decl.output,
)
},
); );
}, },
) )
@ -782,12 +793,19 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
| FnKind::Fn(_, _, sig, _, generics, None) => { | FnKind::Fn(_, _, sig, _, generics, None) => {
self.visit_fn_header(&sig.header); self.visit_fn_header(&sig.header);
self.visit_generics(generics); self.visit_generics(generics);
self.resolve_fn_signature( self.with_lifetime_rib(
fn_id, LifetimeRibKind::AnonymousCreateParameter {
None, binder: fn_id,
sig.decl.has_self(), report_in_path: false,
sig.decl.inputs.iter().map(|Param { ty, .. }| (None, &**ty)), },
&sig.decl.output, |this| {
this.resolve_fn_signature(
fn_id,
sig.decl.has_self(),
sig.decl.inputs.iter().map(|Param { ty, .. }| (None, &**ty)),
&sig.decl.output,
)
},
); );
return; return;
} }
@ -812,15 +830,22 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
let declaration = &sig.decl; let declaration = &sig.decl;
let async_node_id = sig.header.asyncness.opt_return_id(); let async_node_id = sig.header.asyncness.opt_return_id();
this.resolve_fn_signature( this.with_lifetime_rib(
fn_id, LifetimeRibKind::AnonymousCreateParameter {
async_node_id, binder: fn_id,
declaration.has_self(), report_in_path: async_node_id.is_some(),
declaration },
.inputs |this| {
.iter() this.resolve_fn_signature(
.map(|Param { pat, ty, .. }| (Some(&**pat), &**ty)), fn_id,
&declaration.output, declaration.has_self(),
declaration
.inputs
.iter()
.map(|Param { pat, ty, .. }| (Some(&**pat), &**ty)),
&declaration.output,
)
},
); );
// Construct the list of in-scope lifetime parameters for async lowering. // Construct the list of in-scope lifetime parameters for async lowering.
@ -1035,12 +1060,19 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
kind: LifetimeBinderKind::PolyTrait, kind: LifetimeBinderKind::PolyTrait,
.. ..
} => { } => {
self.resolve_fn_signature( self.with_lifetime_rib(
binder, LifetimeRibKind::AnonymousCreateParameter {
None, binder,
false, report_in_path: false,
p_args.inputs.iter().map(|ty| (None, &**ty)), },
&p_args.output, |this| {
this.resolve_fn_signature(
binder,
false,
p_args.inputs.iter().map(|ty| (None, &**ty)),
&p_args.output,
)
},
); );
break; break;
} }
@ -1813,18 +1845,12 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
fn resolve_fn_signature( fn resolve_fn_signature(
&mut self, &mut self,
fn_id: NodeId, fn_id: NodeId,
async_node_id: Option<NodeId>,
has_self: bool, has_self: bool,
inputs: impl Iterator<Item = (Option<&'ast Pat>, &'ast Ty)> + Clone, inputs: impl Iterator<Item = (Option<&'ast Pat>, &'ast Ty)> + Clone,
output_ty: &'ast FnRetTy, output_ty: &'ast FnRetTy,
) { ) {
// Add each argument to the rib. // Add each argument to the rib.
let parameter_rib = LifetimeRibKind::AnonymousCreateParameter { let elision_lifetime = self.resolve_fn_params(has_self, inputs);
binder: fn_id,
report_in_path: async_node_id.is_some(),
};
let elision_lifetime =
self.with_lifetime_rib(parameter_rib, |this| this.resolve_fn_params(has_self, inputs));
debug!(?elision_lifetime); debug!(?elision_lifetime);
let outer_failures = take(&mut self.diagnostic_metadata.current_elision_failures); let outer_failures = take(&mut self.diagnostic_metadata.current_elision_failures);