Skip to content

Commit

Permalink
syntax and rustc: fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Aug 10, 2013
1 parent e48ca19 commit 5b2c1c5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/librustc/back/rpath.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use metadata::cstore;
use metadata::filesearch;

use std::hashmap::HashSet;
use std::{num, os, path, uint, util, vec};
use std::{os, util, vec};

fn not_win32(os: session::os) -> bool {
os != session::os_win32
Expand Down
1 change: 0 additions & 1 deletion src/librustc/metadata/filesearch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

use std::option;
use std::os;
use std::{result, str};
use std::hashmap::HashSet;

// A module for searching for libraries
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/ext/ifmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ pub fn expand_syntax_ext(ecx: @ExtCtxt, sp: span,
};
cx.fmtsp = efmt.span;
let fmt = expr_to_str(ecx, efmt,
~"first argument to ifmt! must be a string literal.");
"first argument to ifmt! must be a string literal.");

let mut err = false;
do parse::parse_error::cond.trap(|m| {
Expand Down

3 comments on commit 5b2c1c5

@bors
Copy link
Contributor

@bors bors commented on 5b2c1c5 Aug 10, 2013

Choose a reason for hiding this comment

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

saw approval from erickt
at erickt@5b2c1c5

@bors
Copy link
Contributor

@bors bors commented on 5b2c1c5 Aug 10, 2013

Choose a reason for hiding this comment

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

merging erickt/rust/cleanup-iterators = 5b2c1c5 into auto

@bors
Copy link
Contributor

@bors bors commented on 5b2c1c5 Aug 10, 2013

Choose a reason for hiding this comment

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

erickt/rust/cleanup-iterators = 5b2c1c5 merged ok, testing candidate = cb81ae65

Please sign in to comment.