Move ending_semi_or_hi to SourceMap for code reuse.

Author: m-ou-se

compiler/rustc_ast_lowering/src/item.rs

@@ -216,15 +216,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 if body.is_none() && !is_instrinsic {
                     self.dcx().emit_err(FnWithoutBody {
                         span,
-                        replace_span: {
-                            let source_map = self.tcx.sess.source_map();
-                            let end = source_map.end_point(span);
-                            if source_map.span_to_snippet(end).is_ok_and(|s| s == ";") {
-                                end
-                            } else {
-                                span.shrink_to_hi()
-                            }
-                        },
+                        replace_span: self.tcx.sess.source_map().span_ending_semi_or_hi(span),
                         extern_block_suggestion: match header.ext {
                             Extern::None => None,
                             Extern::Implicit(start_span) => Some(ExternBlockSuggestion::Implicit {

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -398,19 +398,6 @@ impl<'a> AstValidator<'a> {
         }
     }
 
-    /// If `sp` ends with a semicolon, returns it as a `Span`
-    /// Otherwise, returns `sp.shrink_to_hi()`
-    fn ending_semi_or_hi(&self, sp: Span) -> Span {
-        let source_map = self.sess.source_map();
-        let end = source_map.end_point(sp);
-
-        if source_map.span_to_snippet(end).is_ok_and(|s| s == ";") {
-            end
-        } else {
-            sp.shrink_to_hi()
-        }
-    }
-
     fn check_type_no_bounds(&self, bounds: &[GenericBound], ctx: &str) {
         let span = match bounds {
             [] => return,
@@ -1053,7 +1040,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 if expr.is_none() {
                     self.dcx().emit_err(errors::ConstWithoutBody {
                         span: item.span,
-                        replace_span: self.ending_semi_or_hi(item.span),
+                        replace_span: self.sess.source_map().span_ending_semi_or_hi(item.span),
                     });
                 }
             }
@@ -1066,7 +1053,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 if expr.is_none() {
                     self.dcx().emit_err(errors::StaticWithoutBody {
                         span: item.span,
-                        replace_span: self.ending_semi_or_hi(item.span),
+                        replace_span: self.sess.source_map().span_ending_semi_or_hi(item.span),
                     });
                 }
             }
@@ -1077,7 +1064,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 if ty.is_none() {
                     self.dcx().emit_err(errors::TyAliasWithoutBody {
                         span: item.span,
-                        replace_span: self.ending_semi_or_hi(item.span),
+                        replace_span: self.sess.source_map().span_ending_semi_or_hi(item.span),
                     });
                 }
                 self.check_type_no_bounds(bounds, "this context");
@@ -1398,22 +1385,22 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 AssocItemKind::Const(box ConstItem { expr: None, .. }) => {
                     self.dcx().emit_err(errors::AssocConstWithoutBody {
                         span: item.span,
-                        replace_span: self.ending_semi_or_hi(item.span),
+                        replace_span: self.sess.source_map().span_ending_semi_or_hi(item.span),
                     });
                 }
                 AssocItemKind::Fn(box Fn { body, .. }) => {
                     if body.is_none() {
                         self.dcx().emit_err(errors::AssocFnWithoutBody {
                             span: item.span,
-                            replace_span: self.ending_semi_or_hi(item.span),
+                            replace_span: self.sess.source_map().span_ending_semi_or_hi(item.span),
                         });
                     }
                 }
                 AssocItemKind::Type(box TyAlias { bounds, ty, .. }) => {
                     if ty.is_none() {
                         self.dcx().emit_err(errors::AssocTypeWithoutBody {
                             span: item.span,
-                            replace_span: self.ending_semi_or_hi(item.span),
+                            replace_span: self.sess.source_map().span_ending_semi_or_hi(item.span),
                         });
                     }
                     self.check_type_no_bounds(bounds, "`impl`s");

compiler/rustc_span/src/source_map.rs

@@ -1080,6 +1080,13 @@ impl SourceMap {
         let span = self.next_point(span);
         if self.span_to_snippet(span).as_deref() == Ok(";") { Some(span) } else { None }
     }
+
+    /// If `sp` ends with a semicolon, returns it as a `Span`
+    /// Otherwise, returns `sp.shrink_to_hi()`
+    pub fn span_ending_semi_or_hi(&self, sp: Span) -> Span {
+        let end = self.end_point(sp);
+        if self.span_to_snippet(end).is_ok_and(|s| s == ";") { end } else { sp.shrink_to_hi() }
+    }
 }
 
 pub fn get_source_map() -> Option<Arc<SourceMap>> {