Skip to content

Commit

Permalink
Some random things
Browse files Browse the repository at this point in the history
  • Loading branch information
nrc committed Jan 12, 2015
1 parent 22a059d commit bc3a330
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/librustc/metadata/filesearch.rs
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/librustc/session/search_paths.rs
Expand Up @@ -10,7 +10,7 @@

use std::slice;

#[derive(Clone)]
#[derive(Clone, Show)]
pub struct SearchPaths {
paths: Vec<(PathKind, Path)>,
}
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_driver/lib.rs
Expand Up @@ -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;
Expand Down

7 comments on commit bc3a330

@bors
Copy link
Contributor

@bors bors commented on bc3a330 Jan 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from eddyb
at nrc@bc3a330

@bors
Copy link
Contributor

@bors bors commented on bc3a330 Jan 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging nick29581/rust/ast_map = bc3a330 into auto

@bors
Copy link
Contributor

@bors bors commented on bc3a330 Jan 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

status: {"merge_sha": "6ba9acd8ab0fc6ab5ce3776a1a50fe1431125ed8"}

@bors
Copy link
Contributor

@bors bors commented on bc3a330 Jan 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nick29581/rust/ast_map = bc3a330 merged ok, testing candidate = 6ba9acd

@bors
Copy link
Contributor

@bors bors commented on bc3a330 Jan 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6ba9acd

@bors
Copy link
Contributor

@bors bors commented on bc3a330 Jan 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6ba9acd

Please sign in to comment.