diff options
| author | bors <bors@rust-lang.org> | 2024-12-02 12:17:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-02 12:17:12 +0000 |
| commit | 3bff51ea912d4dfd9caa1e3bc6f68352618208a7 (patch) | |
| tree | 0d46c14092030751d439bb8bf5f589ddae2b549b /compiler/rustc_trait_selection/src | |
| parent | bd36e69d2533ee750e2d805915b8ca88d2825e0f (diff) | |
| parent | 9cac33a75dee6c42ad52d6cf33444a06a6aefc1e (diff) | |
| download | rust-3bff51ea912d4dfd9caa1e3bc6f68352618208a7.tar.gz rust-3bff51ea912d4dfd9caa1e3bc6f68352618208a7.zip | |
Auto merge of #133728 - jhpratt:rollup-k1i60pg, r=jhpratt
Rollup of 4 pull requests Successful merges: - #133589 (Remove `hir::ArrayLen`) - #133672 (Remove a bunch of unnecessary const stability noise) - #133678 (Stabilize `ptr::fn_addr_eq`) - #133727 (Update mailmap) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs index 0f9d4cb1982..8ba7969207e 100644 --- a/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs +++ b/compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs @@ -1837,11 +1837,10 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> { }; if let Some(tykind) = tykind && let hir::TyKind::Array(_, length) = tykind - && let hir::ArrayLen::Body(ct) = length && let Some((scalar, ty)) = sz.found.try_to_scalar() && ty == self.tcx.types.usize { - let span = ct.span(); + let span = length.span(); Some(TypeErrorAdditionalDiags::ConsiderSpecifyingLength { span, length: scalar.to_target_usize(&self.tcx).unwrap(), |