Auto merge of #141644 - compiler-errors:rollup-gl5hize, r=compiler-errors

Rollup of 17 pull requests
Successful merges:
- #140591 (Fix malformed suggestion for E0061 when method is a macro token in macro context)
- #141536 (Improve `ambiguous_wide_pointer_comparisons` lint compare diagnostics)
- #141552 (Pull out dedicated `cfg_version` syntax test from feature gate test)
- #141556 (bootstrap: translate Windows paths in a way that works for both Cygwin and MSYS2)
- #141563 (Remove out-of-date `noop_*` names.)
- #141568 (dist: make sure llvm-project submodule is present)
- #141580 (Use more detailed spans in dyn compat errors within bodies)
- #141582 (intrinsics, ScalarInt: minor cleanup)
- #141584 (Support `opaque_types_defined_by` for `SyntheticCoroutineBody`)
- #141587 (Add missing edition directives for async-await tests)
- #141594 (Add `generic_arg_infer` test)
- #141596 (rustc book: fix erratic sentence by making it more simple)
- #141599 (Remove an unnecessary use of `Box::into_inner`.)
- #141611 (Update mdbook to 0.4.51)
- #141616 (Remove spastorino from vacations)
- #141623 (use custom types to clarify arguments to `emit_ptr_va_arg`)
- #141635 (further dedup `WalkItemKind` for `mut_visit` and `visit`)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_ast/src/mut_visit.rs

@@ -40,12 +40,6 @@ pub trait MutVisitor: Sized {
 // fn flat_map_t(&mut self, t: T) -> SmallVec<[T; 1]>; // rare
 // fn filter_map_t(&mut self, t: T) -> Option<T>; // rarest
 //
-// Any additions to this trait should happen in form of a call to a public
-// `noop_*` function that only calls out to the visitor again, not other
-// `noop_*` functions. This is a necessary API workaround to the problem of
-// not being able to call out to the super default method in an overridden
-// default method.
-//
 // When writing these methods, it is better to use destructuring like this:
 //
 // fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
@@ -179,7 +173,7 @@ pub trait MutVisitor: Sized {
 }
 
 fnfilter_map_expr(&mutself,e:P<Expr>) -> Option<P<Expr>>{
-noop_filter_map_expr(self, e)
+walk_filter_map_expr(self, e)
 }
 
 fnvisit_generic_arg(&mutself,arg:&mutGenericArg){
@@ -381,14 +375,11 @@ super::common_visitor_and_walkers!((mut) MutVisitor);
 /// Use a map-style function (`FnOnce(T) -> T`) to overwrite a `&mut T`. Useful
 /// when using a `flat_map_*` or `filter_map_*` method within a `visit_`
 /// method.
-//
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 pubfnvisit_clobber<T:DummyAstNode>(t:&mutT,f:implFnOnce(T) -> T){
 let old_t = std::mem::replace(t,T::dummy());
 *t = f(old_t);
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 #[inline]
 fnvisit_vec<T,F>(elems:&mutVec<T>,mutvisit_elem:F)
 where
@@ -399,7 +390,6 @@ where
 }
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 #[inline]
 fnvisit_thin_vec<T,F>(elems:&mutThinVec<T>,mutvisit_elem:F)
 where
@@ -410,7 +400,6 @@ where
 }
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 #[inline]
 fnvisit_opt<T,F>(opt:&mutOption<T>,mutvisit_elem:F)
 where
@@ -421,25 +410,21 @@ where
 }
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 fnvisit_attrs<T:MutVisitor>(vis:&mutT,attrs:&mutAttrVec){
 for attr in attrs.iter_mut(){
  vis.visit_attribute(attr);
 }
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 #[allow(unused)]
 fnvisit_exprs<T:MutVisitor>(vis:&mutT,exprs:&mutVec<P<Expr>>){
  exprs.flat_map_in_place(|expr| vis.filter_map_expr(expr))
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 fnvisit_thin_exprs<T:MutVisitor>(vis:&mutT,exprs:&mutThinVec<P<Expr>>){
  exprs.flat_map_in_place(|expr| vis.filter_map_expr(expr))
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 fnvisit_attr_args<T:MutVisitor>(vis:&mutT,args:&mutAttrArgs){
 match args {
 AttrArgs::Empty => {}
@@ -451,7 +436,6 @@ fn visit_attr_args<T: MutVisitor>(vis: &mut T, args: &mut AttrArgs) {
 }
 }
 
-// No `noop_` prefix because there isn't a corresponding method in `MutVisitor`.
 fnvisit_delim_args<T:MutVisitor>(vis:&mutT,args:&mutDelimArgs){
 letDelimArgs{ dspan,delim: _,tokens: _ } = args;
 letDelimSpan{ open, close } = dspan;
@@ -1041,78 +1025,6 @@ pub fn walk_item_kind<K: WalkItemKind>(
  kind.walk(span, id, visibility, ctxt, vis)
 }
 
-implWalkItemKindforAssocItemKind{
-typeCtxt = AssocCtxt;
-fnwalk<V:MutVisitor>(
-&mutself,
-span:Span,
-id:NodeId,
-visibility:&mutVisibility,
-ctxt:Self::Ctxt,
-visitor:&mutV,
-){
-matchself{
-AssocItemKind::Const(item) => {
-walk_const_item(visitor, item);
-}
-AssocItemKind::Fn(func) => {
- visitor.visit_fn(FnKind::Fn(FnCtxt::Assoc(ctxt), visibility,&mut*func), span, id);
-}
-AssocItemKind::Type(box TyAlias{
- defaultness,
- ident,
- generics,
- where_clauses,
- bounds,
- ty,
-}) => {
-visit_defaultness(visitor, defaultness);
- visitor.visit_ident(ident);
- visitor.visit_generics(generics);
-visit_bounds(visitor, bounds,BoundKind::Bound);
-visit_opt(ty, |ty| visitor.visit_ty(ty));
-walk_ty_alias_where_clauses(visitor, where_clauses);
-}
-AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
-AssocItemKind::Delegation(box Delegation{
- id,
- qself,
- path,
- ident,
- rename,
- body,
-from_glob: _,
-}) => {
- visitor.visit_id(id);
- visitor.visit_qself(qself);
- visitor.visit_path(path);
- visitor.visit_ident(ident);
-ifletSome(rename) = rename {
- visitor.visit_ident(rename);
-}
-ifletSome(body) = body {
- visitor.visit_block(body);
-}
-}
-AssocItemKind::DelegationMac(box DelegationMac{ qself, prefix, suffixes, body }) => {
- visitor.visit_qself(qself);
- visitor.visit_path(prefix);
-ifletSome(suffixes) = suffixes {
-for(ident, rename)in suffixes {
- visitor.visit_ident(ident);
-ifletSome(rename) = rename {
- visitor.visit_ident(rename);
-}
-}
-}
-ifletSome(body) = body {
- visitor.visit_block(body);
-}
-}
-}
-}
-}
-
 pubfnwalk_crate<T:MutVisitor>(vis:&mutT,krate:&mutCrate){
 letCrate{ attrs, items, spans, id,is_placeholder: _ } = krate;
  vis.visit_id(id);
@@ -1123,14 +1035,6 @@ pub fn walk_crate<T: MutVisitor>(vis: &mut T, krate: &mut Crate) {
  vis.visit_span(inject_use_span);
 }
 
-pubfnwalk_item(visitor:&mutimplMutVisitor,item:&mutP<Item<implWalkItemKind<Ctxt = ()>>>){
-walk_item_ctxt(visitor, item,())
-}
-
-pubfnwalk_assoc_item(visitor:&mutimplMutVisitor,item:&mutP<AssocItem>,ctxt:AssocCtxt){
-walk_item_ctxt(visitor, item, ctxt)
-}
-
 pubfnwalk_flat_map_item(vis:&mutimplMutVisitor,mutitem:P<Item>) -> SmallVec<[P<Item>;1]>{
  vis.visit_item(&mut item);
 smallvec![item]
@@ -1153,53 +1057,6 @@ pub fn walk_flat_map_assoc_item(
 smallvec![item]
 }
 
-implWalkItemKindforForeignItemKind{
-typeCtxt = ();
-fnwalk<V:MutVisitor>(
-&mutself,
-span:Span,
-id:NodeId,
-visibility:&mutVisibility,
-_ctxt:Self::Ctxt,
-visitor:&mutV,
-){
-matchself{
-ForeignItemKind::Static(box StaticItem{
- ident,
- ty,
-mutability: _,
- expr,
-safety: _,
- define_opaque,
-}) => {
- visitor.visit_ident(ident);
- visitor.visit_ty(ty);
-visit_opt(expr, |expr| visitor.visit_expr(expr));
-walk_define_opaques(visitor, define_opaque);
-}
-ForeignItemKind::Fn(func) => {
- visitor.visit_fn(FnKind::Fn(FnCtxt::Foreign, visibility,&mut*func), span, id);
-}
-ForeignItemKind::TyAlias(box TyAlias{
- defaultness,
- ident,
- generics,
- where_clauses,
- bounds,
- ty,
-}) => {
-visit_defaultness(visitor, defaultness);
- visitor.visit_ident(ident);
- visitor.visit_generics(generics);
-visit_bounds(visitor, bounds,BoundKind::Bound);
-visit_opt(ty, |ty| visitor.visit_ty(ty));
-walk_ty_alias_where_clauses(visitor, where_clauses);
-}
-ForeignItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
-}
-}
-}
-
 pubfnwalk_pat<T:MutVisitor>(vis:&mutT,pat:&mutP<Pat>){
 letPat{ id, kind, span,tokens: _ } = pat.deref_mut();
  vis.visit_id(id);
@@ -1500,11 +1357,9 @@ pub fn walk_expr<T: MutVisitor>(vis: &mut T, Expr { kind, id, span, attrs, token
  vis.visit_span(span);
 }
 
-pubfnnoop_filter_map_expr<T:MutVisitor>(vis:&mutT,mute:P<Expr>) -> Option<P<Expr>>{
-Some({
- vis.visit_expr(&mut e);
- e
-})
+pubfnwalk_filter_map_expr<T:MutVisitor>(vis:&mutT,mute:P<Expr>) -> Option<P<Expr>>{
+ vis.visit_expr(&mut e);
+Some(e)
 }
 
 pubfnwalk_flat_map_stmt<T:MutVisitor>(