remove result, use PathBuf

Author: drahnr

compiler/rustc_expand/src/proc_macro_server.rs

@@ -402,8 +402,8 @@ impl server::FreeFunctions for Rustc<'_, '_> {
             .insert((Symbol::intern(var), value.map(Symbol::intern)));
     }
 
-    fn track_path(&mut self, path: &str) {
-        self.sess().file_depinfo.borrow_mut().insert(Symbol::intern(path));
+    fn track_path(&mut self, path: std::path::PathBuf) {
+        self.sess().file_depinfo.borrow_mut().insert(path);
     }
 
     fn literal_from_str(&mut self, s: &str) -> Result<Literal<Self::Span, Self::Symbol>, ()> {

compiler/rustc_interface/src/passes.rs

@@ -476,13 +476,12 @@ fn write_out_deps(tcx: TyCtxt<'_>, outputs: &OutputFilenames, out_filenames: &[P
         // (e.g. accessed in proc macros).
         let file_depinfo = sess.parse_sess.file_depinfo.borrow();
 
-        let normalize_path = |path: PathBuf| {
+        let normalize_path = |path: PathBuf| -> String {
             let file = FileName::from(path);
             escape_dep_filename(&file.prefer_local().to_string())
         };
 
-        let extra_tracked_files =
-            file_depinfo.iter().map(|path_sym| normalize_path(PathBuf::from(path_sym.as_str())));
+        let extra_tracked_files = file_depinfo.iter().map(|path| normalize_path(path.to_owned()));
         files.extend(extra_tracked_files);
 
         // We also need to track used PGO profile files

compiler/rustc_session/src/parse.rs

@@ -209,7 +209,8 @@ pub struct ParseSess {
     /// Environment variables accessed during the build and their values when they exist.
     pub env_depinfo: Lock<FxHashSet<(Symbol, Option<Symbol>)>>,
     /// File paths accessed during the build.
-    pub file_depinfo: Lock<FxHashSet<Symbol>>,
+    /// Paths are relative to ???.
+    pub file_depinfo: Lock<FxHashSet<std::path::PathBuf>>,
     /// Whether cfg(version) should treat the current release as incomplete
     pub assume_incomplete_release: bool,
     /// Spans passed to `proc_macro::quote_span`. Each span has a numerical

library/proc_macro/src/bridge/mod.rs

@@ -57,7 +57,7 @@ macro_rules! with_api {
             FreeFunctions {
                 fn drop($self: $S::FreeFunctions);
                 fn track_env_var(var: &str, value: Option<&str>);
-                fn track_path(path: &str);
+                fn track_path(path: std::path::PathBuf);
                 fn literal_from_str(s: &str) -> Result<Literal<$S::Span, $S::Symbol>, ()>;
                 fn emit_diagnostic(diagnostic: Diagnostic<$S::Span>);
             },

library/proc_macro/src/lib.rs

@@ -1476,18 +1476,14 @@ pub mod tracked {
     ///
     /// Commonly used for tracking asset preprocessing.
     #[unstable(feature = "proc_macro_tracked_path", issue = "73921")]
-    pub fn path<P: AsRef<Path>>(path: P) -> Result<(), ()> {
+    pub fn path<P: AsRef<Path>>(path: P) {
         let path: &Path = path.as_ref();
-        if let Some(path) = path.to_str() {
-            crate::bridge::client::FreeFunctions::track_path(path);
-            Ok(())
-        } else {
-            Err(())
-        }
+        crate::bridge::client::FreeFunctions::track_path(PathBuf::from(path));
     }
 
     use std::env::{self, VarError};
     use std::ffi::OsStr;
+    use std::path::PathBuf;
 
     /// Retrieve an environment variable and add it to build dependency info.
     /// The build system executing the compiler will know that the variable was accessed during

src/tools/rust-analyzer/crates/proc-macro-srv/src/server.rs

@@ -55,7 +55,7 @@ impl server::FreeFunctions for RustAnalyzer {
         // FIXME: track env var accesses
         // https://github.com/rust-lang/rust/pull/71858
     }
-    fn track_path(&mut self, _path: &str) {}
+    fn track_path(&mut self, _path: std::path::PathBuf) {}
 
     fn literal_from_str(
         &mut self,