diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-01-11 18:45:59 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-01-13 09:15:59 +1300 |
| commit | bc3a330abbede28a9ec14cd138b1c0e4ef79cbb0 (patch) | |
| tree | 37e7f261ff6071a061c61725feb9b599e7884370 /src | |
| parent | 22a059ddd1a5f3db52f07e8124c52073d305cc5e (diff) | |
| download | rust-bc3a330abbede28a9ec14cd138b1c0e4ef79cbb0.tar.gz rust-bc3a330abbede28a9ec14cd138b1c0e4ef79cbb0.zip | |
Some random things
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/metadata/filesearch.rs | 2 | ||||
| -rw-r--r-- | src/librustc/session/search_paths.rs | 4 | ||||
| -rw-r--r-- | src/librustc_driver/lib.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index e8160487e16..193b14174c7 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -54,7 +54,7 @@ impl<'a> FileSearch<'a> { debug!("filesearch: searching lib path"); let tlib_path = make_target_lib_path(self.sysroot, - self.triple); + self.triple); if !visited_dirs.contains(tlib_path.as_vec()) { match f(&tlib_path) { FileMatches => found = true, diff --git a/src/librustc/session/search_paths.rs b/src/librustc/session/search_paths.rs index 9bff5435217..0cd501ca05f 100644 --- a/src/librustc/session/search_paths.rs +++ b/src/librustc/session/search_paths.rs @@ -10,7 +10,7 @@ use std::slice; -#[derive(Clone)] +#[derive(Clone, Show)] pub struct SearchPaths { paths: Vec<(PathKind, Path)>, } @@ -20,7 +20,7 @@ pub struct Iter<'a> { iter: slice::Iter<'a, (PathKind, Path)>, } -#[derive(Eq, PartialEq, Clone, Copy)] +#[derive(Eq, PartialEq, Clone, Copy, Show)] pub enum PathKind { Native, Crate, diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index ce2b03e1744..6893c4d72f7 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -186,7 +186,7 @@ fn run_compiler(args: &[String]) { list_metadata(&sess, &(*ifile), &mut stdout).unwrap(); } Input::Str(_) => { - early_error("can not list metadata for stdin"); + early_error("cannot list metadata for stdin"); } } return; |