Small cleanups

Author: aerooneqq

compiler/rustc_ast_lowering/src/delegation.rs

@@ -154,8 +154,6 @@ fn check_for_cycles(
         {
             def_id = delegation_info.resolution_id;
             if visited.contains(&def_id) {
-                // We encountered a cycle in the resolution, or delegation callee refers to non-existent
-                // entity, in this case emit an error.
                 return Err(tcx.dcx().emit_err(CycleInDelegationSignatureResolution { span }));
             }
         } else {

compiler/rustc_resolve/src/late.rs

@@ -3900,11 +3900,11 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
             this.visit_path(&delegation.path);
         });
 
-        let resolution_id = if is_in_trait_impl { item_id } else { delegation.id };
+        let resolution_node_id = if is_in_trait_impl { item_id } else { delegation.id };
         let def_id = self
             .r
             .partial_res_map
-            .get(&resolution_id)
+            .get(&resolution_node_id)
             .and_then(|r| r.expect_full_res().opt_def_id());
 
         let resolution = if let Some(resolution_id) = def_id
@@ -3917,7 +3917,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
             self.r.tcx.dcx().span_delayed_bug(
                 delegation.path.span,
                 format!(
-                    "LoweringContext: couldn't resolve node {resolution_id:?} in delegation item",
+                    "LateResolutionVisitor: couldn't resolve node {resolution_node_id:?} in delegation item",
                 ),
             );