Auto merge of #69474 - Dylan-DPC:rollup-ciotplu, r=Dylan-DPC

[rust.git] / src / librustc_span / lib.rs

diff --git a/src/librustc_span/lib.rs b/src/librustc_span/lib.rs
index 87342d6a301201998712e6863519445d426757e2..f9f3a9003117ff6113994ee2cb64e8ceac32270d 100644 (file)
--- a/src/librustc_span/lib.rs
+++ b/src/librustc_span/lib.rs
@@ -8,9 +8,7 @@
 #![feature(crate_visibility_modifier)]
 #![feature(nll)]
 #![feature(optin_builtin_traits)]
-#![feature(rustc_attrs)]
 #![feature(specialization)]
-#![feature(step_trait)]
 
 use rustc_data_structures::AtomicRef;
 use rustc_macros::HashStable_Generic;
@@ -1077,7 +1075,7 @@ pub fn new(
         unmapped_path: FileName,
         mut src: String,
         start_pos: BytePos,
-    ) -> Result<SourceFile, OffsetOverflowError> {
+    ) -> Self {
         let normalized_pos = normalize_src(&mut src, start_pos);
 
         let src_hash = {
@@ -1091,14 +1089,12 @@ pub fn new(
             hasher.finish::<u128>()
         };
         let end_pos = start_pos.to_usize() + src.len();
-        if end_pos > u32::max_value() as usize {
-            return Err(OffsetOverflowError);
-        }
+        assert!(end_pos <= u32::max_value() as usize);
 
         let (lines, multibyte_chars, non_narrow_chars) =
             analyze_source_file::analyze_source_file(&src[..], start_pos);
 
-        Ok(SourceFile {
+        SourceFile {
             name,
             name_was_remapped,
             unmapped_path: Some(unmapped_path),
@@ -1113,7 +1109,7 @@ pub fn new(
             non_narrow_chars,
             normalized_pos,
             name_hash,
-        })
+        }
     }
 
     /// Returns the `BytePos` of the beginning of the current line.