Auto merge of #133120 - matthiaskrgr:rollup-4actosy, r=matthiaskrgr

Rollup of 7 pull requests
Successful merges:
- #131717 (Stabilize `const_atomic_from_ptr`)
- #132134 (Remove `ResultsVisitable`)
- #132449 (mark is_val_statically_known intrinsic as stably const-callable)
- #132569 (rustdoc search: allow queries to end in an empty path segment)
- #132787 (Unify FnKind between AST visitors and make WalkItemKind more straight forward)
- #132832 (Deny capturing late-bound ty/const params in nested opaques)
- #133097 (Opt out TaKO8Ki from review rotation for now)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_ast/src/mut_visit.rs

@@ -23,7 +23,7 @@ use crate::ast::*;
 usecrate::ptr::P;
 usecrate::token::{self,Token};
 usecrate::tokenstream::*;
-usecrate::visit::{AssocCtxt,BoundKind};
+usecrate::visit::{AssocCtxt,BoundKind,FnCtxt};
 
 pubtraitExpectOne<A:Array>{
 fnexpect_one(self,err:&'staticstr) -> A::Item;
@@ -37,7 +37,16 @@ impl<A: Array> ExpectOne<A> for SmallVec<A> {
 }
 
 pubtraitWalkItemKind{
-fnwalk(&mutself,span:Span,id:NodeId,visitor:&mutimplMutVisitor);
+typeCtxt;
+fnwalk(
+&mutself,
+span:Span,
+id:NodeId,
+ident:&mutIdent,
+visibility:&mutVisibility,
+ctxt:Self::Ctxt,
+visitor:&mutimplMutVisitor,
+);
 }
 
 pubtraitMutVisitor:Sized{
@@ -114,9 +123,9 @@ pub trait MutVisitor: Sized {
 fnflat_map_assoc_item(
 &mutself,
 i:P<AssocItem>,
-_ctxt:AssocCtxt,
+ctxt:AssocCtxt,
 ) -> SmallVec<[P<AssocItem>;1]>{
-walk_flat_map_item(self, i)
+walk_flat_map_assoc_item(self, i, ctxt)
 }
 
 fnvisit_fn_decl(&mutself,d:&mutP<FnDecl>){
@@ -880,7 +889,7 @@ fn walk_coroutine_kind<T: MutVisitor>(vis: &mut T, coroutine_kind: &mut Coroutin
 
 fnwalk_fn<T:MutVisitor>(vis:&mutT,kind:FnKind<'_>){
 match kind {
-FnKind::Fn(FnSig{ header, decl, span }, generics, body) => {
+FnKind::Fn(_ctxt, _ident,FnSig{ header, decl, span }, _visibility, generics, body) => {
 // Identifier and visibility are visited as a part of the item.
  vis.visit_fn_header(header);
  vis.visit_generics(generics);
@@ -890,8 +899,9 @@ fn walk_fn<T: MutVisitor>(vis: &mut T, kind: FnKind<'_>) {
 }
  vis.visit_span(span);
 }
-FnKind::Closure(binder, decl, body) => {
+FnKind::Closure(binder,coroutine_kind,decl, body) => {
  vis.visit_closure_binder(binder);
+ coroutine_kind.as_mut().map(|coroutine_kind| vis.visit_coroutine_kind(coroutine_kind));
  vis.visit_fn_decl(decl);
  vis.visit_expr(body);
 }
@@ -1079,17 +1089,29 @@ pub fn walk_block<T: MutVisitor>(vis: &mut T, block: &mut P<Block>) {
  vis.visit_span(span);
 }
 
-pubfnwalk_item_kind(
-kind:&mutimplWalkItemKind,
+pubfnwalk_item_kind<K:WalkItemKind>(
+kind:&mutK,
 span:Span,
 id:NodeId,
+ident:&mutIdent,
+visibility:&mutVisibility,
+ctxt:K::Ctxt,
 vis:&mutimplMutVisitor,
 ){
- kind.walk(span, id, vis)
+ kind.walk(span, id,ident, visibility, ctxt,vis)
 }
 
 implWalkItemKindforItemKind{
-fnwalk(&mutself,span:Span,id:NodeId,vis:&mutimplMutVisitor){
+typeCtxt = ();
+fnwalk(
+&mutself,
+span:Span,
+id:NodeId,
+ident:&mutIdent,
+visibility:&mutVisibility,
+_ctxt:Self::Ctxt,
+vis:&mutimplMutVisitor,
+){
 matchself{
 ItemKind::ExternCrate(_orig_name) => {}
 ItemKind::Use(use_tree) => vis.visit_use_tree(use_tree),
@@ -1102,7 +1124,11 @@ impl WalkItemKind for ItemKind {
 }
 ItemKind::Fn(boxFn{ defaultness, generics, sig, body }) => {
 visit_defaultness(vis, defaultness);
- vis.visit_fn(FnKind::Fn(sig, generics, body), span, id);
+ vis.visit_fn(
+FnKind::Fn(FnCtxt::Free, ident, sig, visibility, generics, body),
+ span,
+ id,
+);
 }
 ItemKind::Mod(safety, mod_kind) => {
 visit_safety(vis, safety);
@@ -1201,14 +1227,27 @@ impl WalkItemKind for ItemKind {
 }
 
 implWalkItemKindforAssocItemKind{
-fnwalk(&mutself,span:Span,id:NodeId,visitor:&mutimplMutVisitor){
+typeCtxt = AssocCtxt;
+fnwalk(
+&mutself,
+span:Span,
+id:NodeId,
+ident:&mutIdent,
+visibility:&mutVisibility,
+ctxt:Self::Ctxt,
+visitor:&mutimplMutVisitor,
+){
 matchself{
 AssocItemKind::Const(item) => {
 visit_const_item(item, visitor);
 }
 AssocItemKind::Fn(boxFn{ defaultness, generics, sig, body }) => {
 visit_defaultness(visitor, defaultness);
- visitor.visit_fn(FnKind::Fn(sig, generics, body), span, id);
+ visitor.visit_fn(
+FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, visibility, generics, body),
+ span,
+ id,
+);
 }
 AssocItemKind::Type(box TyAlias{
  defaultness,
@@ -1288,32 +1327,52 @@ pub fn walk_crate<T: MutVisitor>(vis: &mut T, krate: &mut Crate) {
  vis.visit_span(inject_use_span);
 }
 
-/// Mutates one item, returning the item again.
-pubfnwalk_flat_map_item<K:WalkItemKind>(
+pubfnwalk_flat_map_item<K:WalkItemKind<Ctxt = ()>>(
+visitor:&mutimplMutVisitor,
+item:P<Item<K>>,
+) -> SmallVec<[P<Item<K>>;1]>{
+walk_flat_map_assoc_item(visitor, item,())
+}
+
+pubfnwalk_flat_map_assoc_item<K:WalkItemKind>(
 visitor:&mutimplMutVisitor,
 mutitem:P<Item<K>>,
+ctxt:K::Ctxt,
 ) -> SmallVec<[P<Item<K>>;1]>{
 letItem{ ident, attrs, id, kind, vis, span, tokens } = item.deref_mut();
  visitor.visit_id(id);
 visit_attrs(visitor, attrs);
  visitor.visit_vis(vis);
  visitor.visit_ident(ident);
- kind.walk(*span,*id, visitor);
+ kind.walk(*span,*id,ident, vis, ctxt,visitor);
 visit_lazy_tts(visitor, tokens);
  visitor.visit_span(span);
 smallvec![item]
 }
 
 implWalkItemKindforForeignItemKind{
-fnwalk(&mutself,span:Span,id:NodeId,visitor:&mutimplMutVisitor){
+typeCtxt = ();
+fnwalk(
+&mutself,
+span:Span,
+id:NodeId,
+ident:&mutIdent,
+visibility:&mutVisibility,
+_ctxt:Self::Ctxt,
+visitor:&mutimplMutVisitor,
+){
 matchself{
 ForeignItemKind::Static(box StaticItem{ ty,mutability: _, expr,safety: _ }) => {
  visitor.visit_ty(ty);
 visit_opt(expr, |expr| visitor.visit_expr(expr));
 }
 ForeignItemKind::Fn(boxFn{ defaultness, generics, sig, body }) => {
 visit_defaultness(visitor, defaultness);
- visitor.visit_fn(FnKind::Fn(sig, generics, body), span, id);
+ visitor.visit_fn(
+FnKind::Fn(FnCtxt::Foreign, ident, sig, visibility, generics, body),
+ span,
+ id,
+);
 }
 ForeignItemKind::TyAlias(box TyAlias{
  defaultness,
@@ -1522,9 +1581,8 @@ pub fn walk_expr<T: MutVisitor>(vis: &mut T, Expr { kind, id, span, attrs, token
  fn_arg_span,
 }) => {
 visit_constness(vis, constness);
- coroutine_kind.as_mut().map(|coroutine_kind| vis.visit_coroutine_kind(coroutine_kind));
  vis.visit_capture_by(capture_clause);
- vis.visit_fn(FnKind::Closure(binder, fn_decl, body),*span,*id);
+ vis.visit_fn(FnKind::Closure(binder,coroutine_kind,fn_decl, body),*span,*id);
  vis.visit_span(fn_decl_span);
  vis.visit_span(fn_arg_span);
 }
@@ -1785,8 +1843,20 @@ impl<N: DummyAstNode, T: DummyAstNode> DummyAstNode for crate::ast_traits::AstNo
 #[derive(Debug)]
 pubenumFnKind<'a>{
 /// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
-Fn(&'amutFnSig,&'amutGenerics,&'amutOption<P<Block>>),
+Fn(
+FnCtxt,
+&'amutIdent,
+&'amutFnSig,
+&'amutVisibility,
+&'amutGenerics,
+&'amutOption<P<Block>>,
+),
 
 /// E.g., `|x, y| body`.
-Closure(&'amutClosureBinder,&'amutP<FnDecl>,&'amutP<Expr>),
+Closure(
+&'amutClosureBinder,
+&'amutOption<CoroutineKind>,
+&'amutP<FnDecl>,
+&'amutP<Expr>,
+),
 }