Added hash verification to external source loading.

2017-06-11 13:48:54 +02:00
parent a5b8851e22
commit 9a8bbe9da9
2 changed files with 22 additions and 7 deletions
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -567,13 +567,8 @@ impl CodeMapper for CodeMap {
        };

        if *file_map.external_src.borrow() == ExternalSource::AbsentOk {
-            let mut external_src = file_map.external_src.borrow_mut();
-            if let Ok(src) = self.file_loader.read_file(Path::new(&filename)) {
-                *external_src = ExternalSource::Present(src);
-                return true;
-            } else {
-                *external_src = ExternalSource::AbsentErr;
-            }
+            let src = self.file_loader.read_file(Path::new(&filename)).ok();
+            return file_map.add_external_src(src);
        }

        false