use CmResolver instead of &mut CmResolver

Author: LorrensP-2158466

compiler/rustc_resolve/src/ident.rs

@@ -50,7 +50,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
  ctxt: SyntaxContext,
  derive_fallback_lint_id: Option<NodeId>,
  mut visitor: impl FnMut(
- &mut CmResolver<'r, 'ra, 'tcx>,
+ CmResolver<'_, 'ra, 'tcx>,
  Scope<'ra>,
  UsePrelude,
  SyntaxContext,
@@ -154,7 +154,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 
  if visit {
  let use_prelude = if use_prelude { UsePrelude::Yes } else { UsePrelude::No };
- if let break_result @ Some(..) = visitor(&mut self, scope, use_prelude, ctxt) {
+ if let break_result @ Some(..) = visitor(self.reborrow(), scope, use_prelude, ctxt)
+ {
  return break_result;
  }
  }
@@ -438,7 +439,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
  parent_scope,
  orig_ident.span.ctxt(),
  derive_fallback_lint_id,
- |this, scope, use_prelude, ctxt| {
+ |mut this, scope, use_prelude, ctxt| {
  let ident = Ident::new(orig_ident.name, orig_ident.span.with_ctxt(ctxt));
  let result = match scope {
  Scope::DeriveHelpers(expn_id) => {

compiler/rustc_resolve/src/imports.rs

@@ -873,7 +873,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
  };
 
  let mut indeterminate_count = 0;
- self.per_ns_cm(|this, ns| {
+ self.per_ns_cm(|mut this, ns| {
  if !type_ns_only || ns == TypeNS {
  if bindings[ns].get() != PendingBinding::Pending {
  return;

compiler/rustc_resolve/src/lib.rs

@@ -1835,13 +1835,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
  f(self, MacroNS);
  }
 
- fn per_ns_cm<'r, F: FnMut(&mut CmResolver<'r, 'ra, 'tcx>, Namespace)>(
+ fn per_ns_cm<'r, F: FnMut(CmResolver<'_, 'ra, 'tcx>, Namespace)>(
  mut self: CmResolver<'r, 'ra, 'tcx>,
  mut f: F,
  ) {
- f(&mut self, TypeNS);
- f(&mut self, ValueNS);
- f(&mut self, MacroNS);
+ f(self.reborrow(), TypeNS);
+ f(self.reborrow(), ValueNS);
+ f(self, MacroNS);
  }
 
  fn is_builtin_macro(&self, res: Res) -> bool {
@@ -1898,7 +1898,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
  }
 
  let scope_set = ScopeSet::All(TypeNS);
- self.cm().visit_scopes(scope_set, parent_scope, ctxt, None, |this, scope, _, _| {
+ self.cm().visit_scopes(scope_set, parent_scope, ctxt, None, |mut this, scope, _, _| {
  match scope {
  Scope::Module(module, _) => {
  this.get_mut().traits_in_module(module, assoc_item, &mut found_traits);