about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2024-06-12 10:26:12 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2024-06-12 10:26:12 +0000
commitbe464b800c5875d23549afb744dcd3cf428ed539 (patch)
tree474d93aaabf855bf2dfde2adbb3c07413d52a897
parent3da92891fd3f1eecb6b16d080da6ac3447f5bd9b (diff)
downloadrust-be464b800c5875d23549afb744dcd3cf428ed539.tar.gz
rust-be464b800c5875d23549afb744dcd3cf428ed539.zip
Upgrade a span_delayed_bug into a span_bug, as we have no tests hitting it.
-rw-r--r--compiler/rustc_hir_typeck/src/expr.rs16
1 files changed, 9 insertions, 7 deletions
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
index d77d898f3bd..cf2bf0d8f8b 100644
--- a/compiler/rustc_hir_typeck/src/expr.rs
+++ b/compiler/rustc_hir_typeck/src/expr.rs
@@ -1341,14 +1341,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 self.write_method_call_and_enforce_effects(expr.hir_id, expr.span, method);
                 Ok(method)
             }
-            Err(error) => Err(if segment.ident.name == kw::Empty {
-                self.dcx().span_delayed_bug(rcvr.span, "empty method name")
-            } else {
-                match self.report_method_error(expr.hir_id, rcvr_t, error, expected, false) {
-                    Ok(diag) => diag.emit(),
-                    Err(guar) => guar,
+            Err(error) => {
+                if segment.ident.name == kw::Empty {
+                    span_bug!(rcvr.span, "empty method name")
+                } else {
+                    match self.report_method_error(expr.hir_id, rcvr_t, error, expected, false) {
+                        Ok(diag) => Err(diag.emit()),
+                        Err(guar) => Err(guar),
+                    }
                 }
-            }),
+            }
         };
 
         // Call the generic checker.