Auto merge of #123468 - compiler-errors:precise-capturing, r=oli-obk
Implement syntax for `impl Trait` to specify its captures explicitly (`feature(precise_capturing)`) Implements `impl use<'a, 'b, T, U> Sized` syntax that allows users to explicitly list the captured parameters for an opaque, rather than inferring it from the opaque's bounds (or capturing *all* lifetimes under 2024-edition capture rules). This allows us to exclude some implicit captures, so this syntax may be used as a migration strategy for changes due to #117587. We represent this list of captured params as `PreciseCapturingArg` in AST and HIR, resolving them between `rustc_resolve` and `resolve_bound_vars`. Later on, we validate that the opaques only capture the parameters in this list. We artificially limit the feature to *require* mentioning all type and const parameters, since we don't currently have support for non-lifetime bivariant generics. This can be relaxed in the future. We also may need to limit this to require naming *all* lifetime parameters for RPITIT, since GATs have no variance. I have to investigate this. This can also be relaxed in the future. r? `@oli-obk` Tracking issue: - https://github.com/rust-lang/rust/issues/123432
This commit is contained in:
commit
a568985c4f
@ -843,7 +843,11 @@ impl Rewrite for ast::Ty {
|
||||
rewrite_macro(mac, None, context, shape, MacroPosition::Expression)
|
||||
}
|
||||
ast::TyKind::ImplicitSelf => Some(String::from("")),
|
||||
ast::TyKind::ImplTrait(_, ref it) => {
|
||||
ast::TyKind::ImplTrait(_, ref it, ref captures) => {
|
||||
// FIXME(precise_capturing): Implement formatting.
|
||||
if captures.is_some() {
|
||||
return None;
|
||||
}
|
||||
// Empty trait is not a parser error.
|
||||
if it.is_empty() {
|
||||
return Some("impl".to_owned());
|
||||
@ -1106,7 +1110,8 @@ fn join_bounds_inner(
|
||||
|
||||
pub(crate) fn opaque_ty(ty: &Option<ptr::P<ast::Ty>>) -> Option<&ast::GenericBounds> {
|
||||
ty.as_ref().and_then(|t| match &t.kind {
|
||||
ast::TyKind::ImplTrait(_, bounds) => Some(bounds),
|
||||
// FIXME(precise_capturing): Implement support here
|
||||
ast::TyKind::ImplTrait(_, bounds, _) => Some(bounds),
|
||||
_ => None,
|
||||
})
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user