Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow $foo:block nonterminals in expression position
Fixes #13678.
- Loading branch information
Showing
2 changed files
with
32 additions
and
7 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Copyright 2014 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. | ||
|
||
#![feature(macro_rules)] | ||
|
||
macro_rules! do_block{ | ||
($val:block) => {$val} | ||
} | ||
|
||
fn main() { | ||
let s; | ||
do_block!({ s = "it works!"; }); | ||
assert_eq!(s, "it works!"); | ||
} |
ff0f9b6
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 huonw
at lilyball@ff0f9b6
ff0f9b6
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/nt_block = ff0f9b6 into auto
ff0f9b6
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/nt_block = ff0f9b6 merged ok, testing candidate = a7ab733
ff0f9b6
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/5946
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5944
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/5040
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/5048
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/6043
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/5132
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/5140
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/6046
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/5131
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/5137
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/5199
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2932
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/6039
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/5135
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/5150
ff0f9b6
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 = a7ab733