Auto merge of rust-lang#17069 - lnicola:fix-skip-array-dispatch, r=lnicola

bors · bors · commit 771e0ae6ee4c · 2024-04-15T05:56:22.000Z
minor: Fix `rustc_skip_array_during_method_dispatch` edition check CC rust-lang#16450
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs b/src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs
@@ -1157,7 +1157,7 @@ fn iterate_trait_method_candidates(
         {
             // FIXME: this should really be using the edition of the method name's span, in case it
             // comes from a macro
-            if db.crate_graph()[krate].edition < Edition::CURRENT {
+            if db.crate_graph()[krate].edition < Edition::Edition2021 {
                 continue;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1157,7 +1157,7 @@ fn iterate_trait_method_candidates(`
`1157`	`1157`	`{`
`1158`	`1158`	`// FIXME: this should really be using the edition of the method name's span, in case it`
`1159`	`1159`	`// comes from a macro`
`1160`		`- if db.crate_graph()[krate].edition < Edition::CURRENT {`
	`1160`	`+ if db.crate_graph()[krate].edition < Edition::Edition2021 {`
`1161`	`1161`	`continue;`
`1162`	`1162`	`}`
`1163`	`1163`	`}`