rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

syntax: abstract over the file loading mechanism.

Browse Source
This commit is contained in:
Eduard Burtescu
2015-05-14 01:44:57 +03:00
parent 0d50b043f7
commit 07d4f77790
3 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsyntax/parse/parser.rs
View File

@@ -79,7 +79,6 @@ use parse::PResult;
use diagnostic::FatalError;
use std::collections::HashSet;
use std::fs;
use std::io::prelude::*;
use std::mem;
use std::path::{Path, PathBuf};
@@ -4851,8 +4850,8 @@ impl<'a> Parser<'a> {
let secondary_path_str = format!("{}/mod.rs", mod_name);
let default_path = dir_path.join(&default_path_str[..]);
let secondary_path = dir_path.join(&secondary_path_str[..]);
let default_exists = fs::metadata(&default_path).is_ok();
let secondary_exists = fs::metadata(&secondary_path).is_ok();
let default_exists = self.sess.codemap().file_exists(&default_path);
let secondary_exists = self.sess.codemap().file_exists(&secondary_path);
if !self.owns_directory {
self.span_err(id_sp,