Skip to content

Rollup of PRs in the queue; Monday #23219

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 19 commits into from
Mar 9, 2015
Merged

Rollup of PRs in the queue; Monday #23219

merged 19 commits into from
Mar 9, 2015

Conversation

Manishearth
Copy link
Member

No description provided.

FuGangqiang and others added 11 commits March 7, 2015 18:03
If we end the `scoped` call with a semicolon, the `JoinGuard` will be
dropped and not returned from the `map`. The thread will start up and
we immediately block, making for a very expensive sequential loop.
A minor change to avoid making the reader think 'where is this'.
rustc will ICE if you specify an outfile path that is bare without a
directory. As a workaround, before this -o ./foo will work
@Manishearth
Copy link
Member Author

@bors: r+ p=20

@bors
Copy link
Collaborator

bors commented Mar 9, 2015

@bors r=Manishearth cdf2ee4

…richton

 Motivated by the test output not lining up when it could, I normalized all of the issue-* tests.

While doing it, I found some lexer tests that could be unignored and fixed an int -> isize.
 rustc will ICE if you specify an outfile path that is bare without a
directory. As a workaround, before this -o ./foo will work

It wasn't clear to me where I could put a test that actually invokes rustc from a shell, although I think I can add doctests to that machinery in librustc_driver that will arrange for this to be called with arguments that would trigger the ICE
…rent, r=steveklabnik

 If we end the `scoped` call with a semicolon, the `JoinGuard` will be
dropped and not returned from the `map`. The thread will start up and
we immediately block, making for a very expensive sequential loop.
 A minor change to avoid making the reader think 'where is this'.
@Manishearth
Copy link
Member Author

@bors: r+ force

@bors
Copy link
Collaborator

bors commented Mar 9, 2015

@bors r=Manishearth f3c427c

@bors
Copy link
Collaborator

bors commented Mar 9, 2015

⌛ Testing commit f3c427c with merge efc4ec3...

@bors
Copy link
Collaborator

bors commented Mar 9, 2015

💔 Test failed - auto-mac-32-opt

@Manishearth
Copy link
Member Author

@bors: retry

@Manishearth
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Mar 9, 2015

@bors r=Manishearth 6468300

bors added a commit that referenced this pull request Mar 9, 2015
@bors
Copy link
Collaborator

bors commented Mar 9, 2015

⌛ Testing commit 6468300 with merge 777f5d9...

@bors
Copy link
Collaborator

bors commented Mar 9, 2015

@bors bors merged commit 6468300 into rust-lang:master Mar 9, 2015
@Manishearth Manishearth deleted the rollup branch March 9, 2015 18:33
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants