-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support imports of the form
use {foo,bar}
This fixes #10806.
- Loading branch information
Showing
3 changed files
with
66 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// xfail-fast | ||
|
||
pub fn foo() -> int { | ||
3 | ||
} | ||
pub fn bar() -> int { | ||
4 | ||
} | ||
|
||
pub mod baz { | ||
use {foo, bar}; | ||
pub fn quux() -> int { | ||
foo() + bar() | ||
} | ||
} | ||
|
||
pub mod grault { | ||
use {foo}; | ||
pub fn garply() -> int { | ||
foo() | ||
} | ||
} | ||
|
||
pub mod waldo { | ||
use {}; | ||
pub fn plugh() -> int { | ||
0 | ||
} | ||
} | ||
|
||
fn main() { | ||
let _x = baz::quux(); | ||
let _y = grault::garply(); | ||
let _z = waldo::plugh(); | ||
} |
bd36b06
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at lilyball@bd36b06
bd36b06
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging kballard/rust/use-braces = bd36b06 into auto
bd36b06
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kballard/rust/use-braces = bd36b06 merged ok, testing candidate = fff03a5
bd36b06
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2896
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/741
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/742
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2900
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2006
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2005
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2912
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2004
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2005
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2914
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2004
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2004
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2080
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2901
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2005
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2007
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2676
bd36b06
There was a problem hiding this comment.
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 = fff03a5