Skip to content

Commit

Permalink
fix formating and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
emberian committed May 10, 2013
1 parent 0afcd34 commit 9cbab89
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/librustc/middle/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2487,7 +2487,7 @@ pub impl Resolver {
if module_name == ~"???" {
self.session.span_err(span {lo: span.lo, hi: span.lo +
BytePos(str::len(*segment_name)), expn_info:
span.expn_info}, fmt!("unresolved import. maybe \
span.expn_info}, fmt!("unresolved import. maybe \
a missing 'extern mod %s'?",
*segment_name));
return Failed;
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-1697.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// Testing that we don't fail abnormally after hitting the errors

use unresolved::*; //~ ERROR unresolved name
use unresolved::*; //~ ERROR unresolved import. maybe a missing
//~^ ERROR failed to resolve import

fn main() {
Expand Down

5 comments on commit 9cbab89

@bors
Copy link
Contributor

@bors bors commented on 9cbab89 May 10, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 9cbab89 May 10, 2013

Choose a reason for hiding this comment

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

merging cmr/rust/unknown_module_resolve_error = 9cbab89 into auto

@bors
Copy link
Contributor

@bors bors commented on 9cbab89 May 10, 2013

Choose a reason for hiding this comment

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

cmr/rust/unknown_module_resolve_error = 9cbab89 merged ok, testing candidate = f04eb37

@bors
Copy link
Contributor

@bors bors commented on 9cbab89 May 10, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 9cbab89 May 10, 2013

Choose a reason for hiding this comment

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

fast-forwarding incoming to auto = f04eb37

Please sign in to comment.