Use relative positions inside a SourceFile.

cjgillot · cjgillot · commit 61a0b77e1753 · 2023-09-03T12:56:10.000Z
diff --git a/src/debuginfo/line_info.rs b/src/debuginfo/line_info.rs
@@ -82,12 +82,9 @@ impl DebugContext {
         match tcx.sess.source_map().lookup_line(span.lo()) {
             Ok(SourceFileAndLine { sf: file, line }) => {
                 let line_pos = file.lines(|lines| lines[line]);
+                let col = file.relative_position(span.lo()) - line_pos;
 
-                (
-                    file,
-                    u64::try_from(line).unwrap() + 1,
-                    u64::from((span.lo() - line_pos).to_u32()) + 1,
-                )
+                (file, u64::try_from(line).unwrap() + 1, u64::from(col.to_u32()) + 1)
             }
             Err(file) => (file, 0, 0),
         }

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,9 @@ impl DebugContext {`
`82`	`82`	`match tcx.sess.source_map().lookup_line(span.lo()) {`
`83`	`83`	`Ok(SourceFileAndLine { sf: file, line }) => {`
`84`	`84`	`let line_pos = file.lines(\|lines\| lines[line]);`
	`85`	`+ let col = file.relative_position(span.lo()) - line_pos;`
`85`	`86`
`86`		`- (`
`87`		`- file,`
`88`		`- u64::try_from(line).unwrap() + 1,`
`89`		`- u64::from((span.lo() - line_pos).to_u32()) + 1,`
`90`		`- )`
	`87`	`+ (file, u64::try_from(line).unwrap() + 1, u64::from(col.to_u32()) + 1)`
`91`	`88`	`}`
`92`	`89`	`Err(file) => (file, 0, 0),`
`93`	`90`	`}`