delegation: Implement multi-item delegation

petrochenkov · petrochenkov · commit 7dda3b889495 · 2024-04-18T23:06:48.000+03:00
```rust
reuse prefix::{a, b, c}
```
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -3107,12 +3107,19 @@ pub struct Fn {
     pub body: Option<P<Block>>,
 }
 
+#[derive(Clone, Encodable, Decodable, Debug)]
+pub enum DelegationKind {
+    Single,
+    List(ThinVec<Ident>),
+}
+
 #[derive(Clone, Encodable, Decodable, Debug)]
 pub struct Delegation {
     /// Path resolution id.
     pub id: NodeId,
     pub qself: Option<P<QSelf>>,
     pub path: Path,
+    pub kind: DelegationKind,
     pub body: Option<P<Block>>,
 }
 
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -1149,10 +1149,18 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
         }
         ItemKind::MacCall(m) => vis.visit_mac_call(m),
         ItemKind::MacroDef(def) => vis.visit_macro_def(def),
-        ItemKind::Delegation(box Delegation { id, qself, path, body }) => {
+        ItemKind::Delegation(box Delegation { id, qself, path, kind, body }) => {
             vis.visit_id(id);
             vis.visit_qself(qself);
             vis.visit_path(path);
+            match kind {
+                DelegationKind::Single => {}
+                DelegationKind::List(suffixes) => {
+                    for ident in suffixes {
+                        vis.visit_ident(ident);
+                    }
+                }
+            }
             if let Some(body) = body {
                 vis.visit_block(body);
             }
@@ -1195,10 +1203,18 @@ pub fn noop_flat_map_assoc_item<T: MutVisitor>(
             visit_opt(ty, |ty| visitor.visit_ty(ty));
         }
         AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
-        AssocItemKind::Delegation(box Delegation { id, qself, path, body }) => {
+        AssocItemKind::Delegation(box Delegation { id, qself, path, kind, body }) => {
             visitor.visit_id(id);
             visitor.visit_qself(qself);
             visitor.visit_path(path);
+            match kind {
+                DelegationKind::Single => {}
+                DelegationKind::List(suffixes) => {
+                    for ident in suffixes {
+                        visitor.visit_ident(ident);
+                    }
+                }
+            }
             if let Some(body) = body {
                 visitor.visit_block(body);
             }
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -382,11 +382,19 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) -> V::Resu
         }
         ItemKind::MacCall(mac) => try_visit!(visitor.visit_mac_call(mac)),
         ItemKind::MacroDef(ts) => try_visit!(visitor.visit_mac_def(ts, item.id)),
-        ItemKind::Delegation(box Delegation { id, qself, path, body }) => {
+        ItemKind::Delegation(box Delegation { id, qself, path, kind, body }) => {
             if let Some(qself) = qself {
                 try_visit!(visitor.visit_ty(&qself.ty));
             }
             try_visit!(visitor.visit_path(path, *id));
+            match kind {
+                DelegationKind::Single => {}
+                DelegationKind::List(suffixes) => {
+                    for ident in suffixes {
+                        visitor.visit_ident(*ident);
+                    }
+                }
+            }
             visit_opt!(visitor, visit_block, body);
         }
     }
@@ -782,11 +790,19 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(
         AssocItemKind::MacCall(mac) => {
             try_visit!(visitor.visit_mac_call(mac));
         }
-        AssocItemKind::Delegation(box Delegation { id, qself, path, body }) => {
+        AssocItemKind::Delegation(box Delegation { id, qself, path, kind, body }) => {
             if let Some(qself) = qself {
                 try_visit!(visitor.visit_ty(&qself.ty));
             }
             try_visit!(visitor.visit_path(path, *id));
+            match kind {
+                DelegationKind::Single => {}
+                DelegationKind::List(suffixes) => {
+                    for ident in suffixes {
+                        visitor.visit_ident(*ident);
+                    }
+                }
+            }
             visit_opt!(visitor, visit_block, body);
         }
     }
diff --git a/compiler/rustc_expand/messages.ftl b/compiler/rustc_expand/messages.ftl
@@ -30,6 +30,9 @@ expand_duplicate_matcher_binding = duplicate matcher binding
     .label = duplicate binding
     .label2 = previous binding
 
+expand_empty_delegation_list =
+    empty list delegation is not supported
+
 expand_expected_comma_in_list =
     expected token: `,`
 
diff --git a/compiler/rustc_expand/src/errors.rs b/compiler/rustc_expand/src/errors.rs
@@ -456,3 +456,10 @@ pub struct ExpectedParenOrBrace<'a> {
     pub span: Span,
     pub token: Cow<'a, str>,
 }
+
+#[derive(Diagnostic)]
+#[diag(expand_empty_delegation_list)]
+pub(crate) struct EmptyDelegationList {
+    #[primary_span]
+    pub span: Span,
+}
diff --git a/compiler/rustc_expand/src/expand.rs b/compiler/rustc_expand/src/expand.rs
@@ -1,8 +1,8 @@
 use crate::base::*;
 use crate::config::StripUnconfigured;
 use crate::errors::{
-    IncompleteParse, RecursionLimitReached, RemoveExprNotSupported, RemoveNodeNotSupported,
-    UnsupportedKeyValue, WrongFragmentKind,
+    EmptyDelegationList, IncompleteParse, RecursionLimitReached, RemoveExprNotSupported,
+    RemoveNodeNotSupported, UnsupportedKeyValue, WrongFragmentKind,
 };
 use crate::hygiene::SyntaxContext;
 use crate::mbe::diagnostics::annotate_err_with_kind;
@@ -15,8 +15,8 @@ use rustc_ast::ptr::P;
 use rustc_ast::token::{self, Delimiter};
 use rustc_ast::tokenstream::TokenStream;
 use rustc_ast::visit::{self, try_visit, walk_list, AssocCtxt, Visitor, VisitorResult};
-use rustc_ast::{AssocItemKind, AstNodeWrapper, AttrArgs, AttrStyle, AttrVec, ExprKind};
-use rustc_ast::{ForeignItemKind, HasAttrs, HasNodeId};
+use rustc_ast::{AssocItemKind, AstNodeWrapper, AttrArgs, AttrStyle, AttrVec, DelegationKind};
+use rustc_ast::{ExprKind, ForeignItemKind, HasAttrs, HasNodeId};
 use rustc_ast::{Inline, ItemKind, MacStmtStyle, MetaItemKind, ModKind};
 use rustc_ast::{NestedMetaItem, NodeId, PatKind, StmtKind, TyKind};
 use rustc_ast_pretty::pprust;
@@ -1061,7 +1061,7 @@ trait InvocationCollectorNode: HasAttrs + HasNodeId + Sized {
     fn wrap_flat_map_node_noop_flat_map(
         node: Self,
         collector: &mut InvocationCollector<'_, '_>,
-        noop_flat_map: impl FnOnce(Self, &mut InvocationCollector<'_, '_>) -> Self::OutputTy,
+        mut noop_flat_map: impl FnMut(Self, &mut InvocationCollector<'_, '_>) -> Self::OutputTy,
     ) -> Result<Self::OutputTy, Self> {
         Ok(noop_flat_map(node, collector))
     }
@@ -1105,8 +1105,19 @@ impl InvocationCollectorNode for P<ast::Item> {
     fn wrap_flat_map_node_noop_flat_map(
         mut node: Self,
         collector: &mut InvocationCollector<'_, '_>,
-        noop_flat_map: impl FnOnce(Self, &mut InvocationCollector<'_, '_>) -> Self::OutputTy,
+        mut noop_flat_map: impl FnMut(Self, &mut InvocationCollector<'_, '_>) -> Self::OutputTy,
     ) -> Result<Self::OutputTy, Self> {
+        if let ItemKind::Delegation(deleg) = &node.kind
+            && let DelegationKind::List(..) = deleg.kind
+        {
+            return Ok(collector.expand_delegation_list(
+                &node,
+                deleg,
+                ItemKind::Delegation,
+                |item, collector| noop_flat_map(item, collector),
+            ));
+        }
+
         if !matches!(node.kind, ItemKind::Mod(..)) {
             return Ok(noop_flat_map(node, collector));
         }
@@ -1230,6 +1241,24 @@ impl InvocationCollectorNode for AstNodeWrapper<P<ast::AssocItem>, TraitItemTag>
             _ => unreachable!(),
         }
     }
+    fn wrap_flat_map_node_noop_flat_map(
+        node: Self,
+        collector: &mut InvocationCollector<'_, '_>,
+        mut noop_flat_map: impl FnMut(Self, &mut InvocationCollector<'_, '_>) -> Self::OutputTy,
+    ) -> Result<Self::OutputTy, Self> {
+        if let AssocItemKind::Delegation(deleg) = &node.wrapped.kind
+            && let DelegationKind::List(..) = deleg.kind
+        {
+            return Ok(collector.expand_delegation_list(
+                &node.wrapped,
+                deleg,
+                AssocItemKind::Delegation,
+                |item, collector| noop_flat_map(AstNodeWrapper::new(item, TraitItemTag), collector),
+            ));
+        }
+
+        Ok(noop_flat_map(node, collector))
+    }
 }
 
 struct ImplItemTag;
@@ -1255,6 +1284,24 @@ impl InvocationCollectorNode for AstNodeWrapper<P<ast::AssocItem>, ImplItemTag>
             _ => unreachable!(),
         }
     }
+    fn wrap_flat_map_node_noop_flat_map(
+        node: Self,
+        collector: &mut InvocationCollector<'_, '_>,
+        mut noop_flat_map: impl FnMut(Self, &mut InvocationCollector<'_, '_>) -> Self::OutputTy,
+    ) -> Result<Self::OutputTy, Self> {
+        if let AssocItemKind::Delegation(deleg) = &node.wrapped.kind
+            && let DelegationKind::List(..) = deleg.kind
+        {
+            return Ok(collector.expand_delegation_list(
+                &node.wrapped,
+                deleg,
+                AssocItemKind::Delegation,
+                |item, collector| noop_flat_map(AstNodeWrapper::new(item, ImplItemTag), collector),
+            ));
+        }
+
+        Ok(noop_flat_map(node, collector))
+    }
 }
 
 impl InvocationCollectorNode for P<ast::ForeignItem> {
@@ -1773,6 +1820,48 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
         });
     }
 
+    fn expand_delegation_list<K: 'static>(
+        &mut self,
+        item: &ast::Item<K>,
+        deleg: &ast::Delegation,
+        kind_delegation: impl Copy + FnOnce(Box<ast::Delegation>) -> K,
+        mut noop_flat_map: impl FnMut(P<ast::Item<K>>, &mut Self) -> SmallVec<[P<ast::Item<K>>; 1]>,
+    ) -> SmallVec<[P<ast::Item<K>>; 1]> {
+        assert_eq!(item.id, ast::DUMMY_NODE_ID);
+        let DelegationKind::List(suffixes) = &deleg.kind else { unreachable!() };
+
+        if suffixes.is_empty() {
+            // Report an error for now, to avoid keeping stem for resolution and stability checks.
+            self.cx.dcx().emit_err(EmptyDelegationList { span: item.span });
+        }
+
+        suffixes
+            .iter()
+            .flat_map(|&ident| {
+                let mut path = deleg.path.clone();
+                path.segments.push(ast::PathSegment { ident, id: ast::DUMMY_NODE_ID, args: None });
+
+                let item = ast::Item {
+                    attrs: item.attrs.clone(),
+                    id: item.id,
+                    span: item.span,
+                    vis: item.vis.clone(),
+                    ident,
+                    kind: kind_delegation(Box::new(ast::Delegation {
+                        id: ast::DUMMY_NODE_ID,
+                        qself: deleg.qself.clone(),
+                        path,
+                        kind: DelegationKind::Single,
+                        body: deleg.body.clone(),
+                    })),
+                    tokens: item.tokens.clone(),
+                };
+
+                noop_flat_map(P(item), self)
+            })
+            .collect()
+    }
+
     fn flat_map_node<Node: InvocationCollectorNode<OutputTy: Default>>(
         &mut self,
         mut node: Node,
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -686,6 +686,14 @@ impl<'a> Parser<'a> {
             (None, self.parse_path(PathStyle::Expr)?)
         };
 
+        let kind = if self.eat(&token::ModSep) {
+            let (suffixes, _) =
+                self.parse_delim_comma_seq(Delimiter::Brace, |p| p.parse_path_segment_ident())?;
+            DelegationKind::List(suffixes)
+        } else {
+            DelegationKind::Single
+        };
+
         let body = if self.check(&token::OpenDelim(Delimiter::Brace)) {
             Some(self.parse_block()?)
         } else {
@@ -696,10 +704,8 @@ impl<'a> Parser<'a> {
         self.psess.gated_spans.gate(sym::fn_delegation, span);
 
         let ident = path.segments.last().map(|seg| seg.ident).unwrap_or(Ident::empty());
-        Ok((
-            ident,
-            ItemKind::Delegation(Box::new(Delegation { id: DUMMY_NODE_ID, qself, path, body })),
-        ))
+        let deleg = Delegation { id: DUMMY_NODE_ID, qself, path, kind, body };
+        Ok((ident, ItemKind::Delegation(Box::new(deleg))))
     }
 
     fn parse_item_list<T>(
diff --git a/compiler/rustc_parse/src/parser/path.rs b/compiler/rustc_parse/src/parser/path.rs
@@ -95,12 +95,15 @@ impl<'a> Parser<'a> {
             debug!("parse_qpath: (decrement) count={:?}", self.unmatched_angle_bracket_count);
         }
 
-        if !self.recover_colon_before_qpath_proj() {
+        let is_import_coupler = self.is_import_coupler();
+        if !is_import_coupler && !self.recover_colon_before_qpath_proj() {
             self.expect(&token::PathSep)?;
         }
 
         let qself = P(QSelf { ty, path_span, position: path.segments.len() });
-        self.parse_path_segments(&mut path.segments, style, None)?;
+        if !is_import_coupler {
+            self.parse_path_segments(&mut path.segments, style, None)?;
+        }
 
         Ok((
             qself,
diff --git a/tests/ui/delegation/multiple-names-body-identity.rs b/tests/ui/delegation/multiple-names-body-identity.rs
@@ -0,0 +1,32 @@
+//@ check-pass
+
+#![feature(fn_delegation)]
+#![allow(incomplete_features)]
+
+trait Trait {
+    fn foo(&self) {}
+    fn bar(&self) {}
+}
+
+impl Trait for u8 {}
+
+struct S(u8);
+
+mod to_import {
+    pub fn check(arg: &u8) -> &u8 { arg }
+}
+
+impl Trait for S {
+    reuse Trait::{foo, bar} {
+        use to_import::check;
+
+        let _arr = Some(self.0).map(|x| [x * 2; 3]);
+        check(&self.0)
+    }
+}
+
+fn main() {
+    let s = S(0);
+    s.foo();
+    s.bar();
+}
diff --git a/tests/ui/delegation/multiple-names-empty.rs b/tests/ui/delegation/multiple-names-empty.rs
@@ -0,0 +1,8 @@
+#![feature(fn_delegation)]
+#![allow(incomplete_features)]
+
+mod m {}
+
+reuse m::{}; //~ ERROR empty list delegation is not supported
+
+fn main() {}
diff --git a/tests/ui/delegation/multiple-names-empty.stderr b/tests/ui/delegation/multiple-names-empty.stderr
@@ -0,0 +1,8 @@
+error: empty list delegation is not supported
+  --> $DIR/multiple-names-empty.rs:6:1
+   |
+LL | reuse m::{};
+   | ^^^^^^^^^^^^
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/delegation/multiple-names.rs b/tests/ui/delegation/multiple-names.rs

Original file line number	Diff line number	Diff line change
`@@ -382,11 +382,19 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) -> V::Resu`
`382`	`382`	`}`
`383`	`383`	`ItemKind::MacCall(mac) => try_visit!(visitor.visit_mac_call(mac)),`
`384`	`384`	`ItemKind::MacroDef(ts) => try_visit!(visitor.visit_mac_def(ts, item.id)),`
`385`		`- ItemKind::Delegation(box Delegation { id, qself, path, body }) => {`
	`385`	`+ ItemKind::Delegation(box Delegation { id, qself, path, kind, body }) => {`
`386`	`386`	`if let Some(qself) = qself {`
`387`	`387`	`try_visit!(visitor.visit_ty(&qself.ty));`
`388`	`388`	`}`
`389`	`389`	`try_visit!(visitor.visit_path(path, *id));`
	`390`	`+ match kind {`
	`391`	`+ DelegationKind::Single => {}`
	`392`	`+ DelegationKind::List(suffixes) => {`
	`393`	`+ for ident in suffixes {`
	`394`	`+ visitor.visit_ident(*ident);`
	`395`	`+ }`
	`396`	`+ }`
	`397`	`+ }`
`390`	`398`	`visit_opt!(visitor, visit_block, body);`
`391`	`399`	`}`
`392`	`400`	`}`
`@@ -782,11 +790,19 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(`
`782`	`790`	`AssocItemKind::MacCall(mac) => {`
`783`	`791`	`try_visit!(visitor.visit_mac_call(mac));`
`784`	`792`	`}`
`785`		`- AssocItemKind::Delegation(box Delegation { id, qself, path, body }) => {`
	`793`	`+ AssocItemKind::Delegation(box Delegation { id, qself, path, kind, body }) => {`
`786`	`794`	`if let Some(qself) = qself {`
`787`	`795`	`try_visit!(visitor.visit_ty(&qself.ty));`
`788`	`796`	`}`
`789`	`797`	`try_visit!(visitor.visit_path(path, *id));`
	`798`	`+ match kind {`
	`799`	`+ DelegationKind::Single => {}`
	`800`	`+ DelegationKind::List(suffixes) => {`
	`801`	`+ for ident in suffixes {`
	`802`	`+ visitor.visit_ident(*ident);`
	`803`	`+ }`
	`804`	`+ }`
	`805`	`+ }`
`790`	`806`	`visit_opt!(visitor, visit_block, body);`
`791`	`807`	`}`
`792`	`808`	`}`