Skip to content

Commit

Permalink
Rollup merge of #71263 - shlevy:FileLoader-remove-abs_path, r=Xanewok
Browse files Browse the repository at this point in the history
Remove unused abs_path method from rustc_span::source_map::FileLoader
  • Loading branch information
Dylan-DPC authored Apr 27, 2020
2 parents 9d00252 + c7899a0 commit 89aff5f
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/librustc_span/source_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use std::path::{Path, PathBuf};
use std::sync::atomic::Ordering;

use log::debug;
use std::env;
use std::fs;
use std::io;

Expand Down Expand Up @@ -64,9 +63,6 @@ pub trait FileLoader {
/// Query the existence of a file.
fn file_exists(&self, path: &Path) -> bool;

/// Returns an absolute path to a file, if possible.
fn abs_path(&self, path: &Path) -> Option<PathBuf>;

/// Read the contents of an UTF-8 file into memory.
fn read_file(&self, path: &Path) -> io::Result<String>;
}
Expand All @@ -79,14 +75,6 @@ impl FileLoader for RealFileLoader {
fs::metadata(path).is_ok()
}

fn abs_path(&self, path: &Path) -> Option<PathBuf> {
if path.is_absolute() {
Some(path.to_path_buf())
} else {
env::current_dir().ok().map(|cwd| cwd.join(path))
}
}

fn read_file(&self, path: &Path) -> io::Result<String> {
fs::read_to_string(path)
}
Expand Down

0 comments on commit 89aff5f

Please sign in to comment.