From bc3a330abbede28a9ec14cd138b1c0e4ef79cbb0 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Sun, 11 Jan 2015 18:45:59 +1300 Subject: [PATCH] Some random things --- src/librustc/metadata/filesearch.rs | 2 +- src/librustc/session/search_paths.rs | 4 ++-- 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 e8160487e16f..193b14174c7a 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 9bff54352179..0cd501ca05fc 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 ce2b03e17448..6893c4d72f7d 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;