From 826b4571a098c8e57d6140658ed6f291d7ca5e21 Mon Sep 17 00:00:00 2001
From: Nick Rolfe <nickrolfe@github.com>
Date: Fri, 30 Oct 2020 11:21:51 +0000
Subject: [PATCH] Canonicalize source file paths in main

---
 extractor/src/extractor.rs | 4 +++-
 extractor/src/main.rs      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extractor/src/extractor.rs b/extractor/src/extractor.rs
index 7405f3392f3..352aa38f85c 100644
--- a/extractor/src/extractor.rs
+++ b/extractor/src/extractor.rs
@@ -17,7 +17,9 @@ pub fn create(language: Language, schema: Vec<Entry>) -> Extractor {
 
     Extractor { parser, schema }
 }
+
 impl Extractor {
+    /// Extracts the source file at `path`, which is assumed to be canonicalized.
     pub fn extract<'a>(&'a mut self, path: &Path) -> std::io::Result<Program> {
         let span = span!(
             Level::TRACE,
@@ -48,7 +50,7 @@ impl Extractor {
                     "files".to_owned(),
                     vec![
                         Arg::Label(file_label),
-                        Arg::String(format!("{}", path.canonicalize()?.display())),
+                        Arg::String(format!("{}", path.display())),
                         Arg::String(format!("{}", path.file_name().unwrap().to_string_lossy())),
                         Arg::String(format!("{}", path.extension().unwrap().to_string_lossy())),
                         Arg::Int(1), // 1 = from source
diff --git a/extractor/src/main.rs b/extractor/src/main.rs
index 6f60b129a78..4dd1aa1e9fc 100644
--- a/extractor/src/main.rs
+++ b/extractor/src/main.rs
@@ -40,7 +40,7 @@ fn main() -> std::io::Result<()> {
     let schema = node_types::read_node_types_str(tree_sitter_ruby::NODE_TYPES)?;
     let mut extractor = extractor::create(language, schema);
     for line in std::io::BufReader::new(file_list).lines() {
-        let path = PathBuf::from(line?);
+        let path = PathBuf::from(line?).canonicalize()?;
         let trap_file = path_for(&trap_dir, &path, ".trap");
         let src_archive_file = path_for(&src_archive_dir, &path, "");
         let trap = extractor.extract(&path)?;