Skip to content

Rollup of 11 pull requests #33005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Apr 16, 2016
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5a8bbf1
Fixes #32922, a macro hygiene bug
jseyfried Apr 13, 2016
f08f75f
Add regression test
jseyfried Apr 13, 2016
340eff6
Update a comment to reflect changes in tidy checks.
LeoTestard Apr 13, 2016
722faa0
Doc fix: Update Cargo.toml in book/getting-started
deepak Apr 13, 2016
974f1ef
Add test for issue #31856
jseyfried Apr 14, 2016
ffff91a
rustbuild: Improve error messaging in bootstrap.py
caipre Apr 14, 2016
e0f997d
rustbuild: Verify sha256 of downloaded tarballs
caipre Apr 14, 2016
01aebf0
implement RFC amendment 1494
durka Feb 9, 2016
d8d8669
Delegate whether to print docblocks to 'document'
pierzchalski Apr 14, 2016
cd85120
trans: always register an item's symbol, even if duplicated.
eddyb Apr 14, 2016
571607f
doc: add missing comma
tshepang Apr 14, 2016
37e59b9
Accommodate the case where dup lang items are entirely external.
taralx Apr 14, 2016
f916491
remove "#" symbols to make the code compile
kindlychung Apr 14, 2016
ca1d29c
Add another test for issue #31856
jseyfried Apr 15, 2016
d95ca28
Add tests against weird provided/required method behaviour
pierzchalski Apr 15, 2016
ec5e0f8
Add flag for whether an item is default or not.
pierzchalski Apr 15, 2016
99c0547
alloc_system: Handle failure properly
alexcrichton Apr 15, 2016
6a0cfbc
Rollup merge of #32923 - jseyfried:fix_hygiene, r=nrc
Manishearth Apr 15, 2016
70601b8
Rollup merge of #32926 - caipre:rustbuild-verify-download, r=alexcric…
Manishearth Apr 15, 2016
7e36dc3
Rollup merge of #32929 - LeoTestard:featureck-comment, r=GuillaumeGomez
Manishearth Apr 15, 2016
50932f5
Rollup merge of #32931 - deepak:gh-issue-32928-update-cargo-in-gettin…
Manishearth Apr 15, 2016
fbbe85c
Rollup merge of #32935 - pierzchalski:restore_trait_impl_docs, r=alex…
Manishearth Apr 15, 2016
90c8d81
Rollup merge of #32945 - durka:rfc1494, r=pnkfelix
Manishearth Apr 15, 2016
5bdbf8e
Rollup merge of #32946 - eddyb:issue-32783, r=dotdash
Manishearth Apr 15, 2016
9873771
Rollup merge of #32964 - tshepang:comma, r=GuillaumeGomez
Manishearth Apr 15, 2016
00d4ac3
Rollup merge of #32970 - taralx:patch-2, r=alexcrichton
Manishearth Apr 15, 2016
eba8055
Rollup merge of #32973 - kindlychung:patch-1, r=steveklabnik
Manishearth Apr 15, 2016
e563359
Rollup merge of #32997 - alexcrichton:fix-alloc-system-how-did-this-l…
Manishearth Apr 15, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test for issue #31856
  • Loading branch information
jseyfried committed Apr 14, 2016
commit 974f1eff58d01ce0bb5583adf0066a84d8eed812
13 changes: 12 additions & 1 deletion src/test/compile-fail/issue-32922.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,23 @@
// except according to those terms.

#![feature(rustc_attrs)]
#![allow(warnings)]

macro_rules! foo { () => {
let x = 1;
macro_rules! bar { () => {x} }
let _ = bar!();
}}

macro_rules! bar { // test issue #31856
($n:ident) => (
let a = 1;
let $n = a;
)
}

#[rustc_error]
fn main() { foo! {}; } //~ ERROR compilation successful
fn main() { //~ ERROR compilation successful
foo! {};
bar! {};
}