Use name instead of absolute path for diagnostics.

rust-lang · May 28, 2024 · d1fb25b · d1fb25b
1 parent 1495acd
commit d1fb25b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/bindgen/codegen/mod.rs b/bindgen/codegen/mod.rs
@@ -4638,12 +4638,13 @@ fn unsupported_abi_diagnostic(
             ..
         }) = location.cloned()
         {
-            let file_path = file.path();
-            if let Ok(Some(source)) = get_line(&file_path, line) {
+            if let Ok(Some(source)) = get_line(file.path(), line) {
                 let mut slice = Slice::default();
-                slice
-                    .with_source(source)
-                    .with_location(file_path, line, column);
+                slice.with_source(source).with_location(
+                    file.name(),
+                    line,
+                    column,
+                );
                 diag.add_slice(slice);
             }
         }
@@ -4680,12 +4681,13 @@ fn variadic_fn_diagnostic(
             ..
         }) = location.cloned()
         {
-            let file_path = file.path();
-            if let Ok(Some(source)) = get_line(&file_path, line) {
+            if let Ok(Some(source)) = get_line(file.path(), line) {
                 let mut slice = Slice::default();
-                slice
-                    .with_source(source)
-                    .with_location(file_path, line, column);
+                slice.with_source(source).with_location(
+                    file.name(),
+                    line,
+                    column,
+                );
                 diag.add_slice(slice);
             }
         }

diff --git a/bindgen/diagnostics.rs b/bindgen/diagnostics.rs
@@ -110,7 +110,7 @@ impl<'a> Diagnostic<'a> {
                 slices.push(ExtSlice {
                     source: source.as_ref(),
                     line_start: slice.line.unwrap_or_default(),
-                    origin: slice.filename.as_deref(),
+                    origin: slice.origin.as_deref(),
                     annotations: vec![],
                     fold: false,
                 })
@@ -146,9 +146,9 @@ impl<'a> Diagnostic<'a> {
 /// A slice of source code.
 #[derive(Default)]
 pub(crate) struct Slice<'a> {
-    source: Option<Cow<'a, str>>,
-    filename: Option<String>,
     line: Option<usize>,
+    origin: Option<String>,
+    source: Option<Cow<'a, str>>,
 }
 
 impl<'a> Slice<'a> {
@@ -162,15 +162,14 @@ impl<'a> Slice<'a> {
     }
 
     /// Set the file, line and column.
-    pub(crate) fn with_location<P: AsRef<Path>>(
+    pub(crate) fn with_location(
         &mut self,
-        path: P,
+        file_name: &str,
         line: usize,
-        col: usize,
+        column: usize,
     ) -> &mut Self {
-        self.filename =
-            Some(format!("{}:{}:{}", path.as_ref().display(), line, col));
         self.line = Some(line);
+        self.origin = Some(format!("{file_name}:{line}:{column}"));
         self
     }
 }

diff --git a/bindgen/ir/var.rs b/bindgen/ir/var.rs
@@ -512,11 +512,10 @@ fn duplicated_macro_diagnostic(
             file, line, column, ..
         } = location
         {
-            let file_path = file.path();
-            if let Ok(Some(code)) = get_line(&file_path, line) {
+            if let Ok(Some(code)) = get_line(file.path(), line) {
                 source = code.into();
             }
-            slice.with_location(file_path, line, column);
+            slice.with_location(file.name(), line, column);
         }
 
         slice.with_source(source);