Skip to content

Rollup of 7 pull requests #25403

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 16 commits into from
May 14, 2015
Merged

Rollup of 7 pull requests #25403

merged 16 commits into from
May 14, 2015

Conversation

mdinger and others added 16 commits May 13, 2015 00:06
This also updates the error messages for both. For E0066, it removes mention
of "managed heap", which was removed in 8a91d33. For E0069, I just tweaked
the wording to make it a bit more explicit.
rustbook throws errors if the `_book` folder exists already. Common if you build twice in a row. Identical to https://github.com/steveklabnik/rustbook/issues/20
Adds explanations for E0053, E0066, E0069, E0251, E0252, E0255, E0256, E0368.

cc rust-lang#24407
…r=steveklabnik

Minor link fix for crates.io.
@Manishearth
Copy link
Member Author

@bors: r+ p=10 force

@bors
Copy link
Collaborator

bors commented May 14, 2015

📌 Commit 2df7ae6 has been approved by Manishearth

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Collaborator

bors commented May 14, 2015

⌛ Testing commit 2df7ae6 with merge 74a9638...

@bors
Copy link
Collaborator

bors commented May 14, 2015

💔 Test failed - auto-win-64-opt

@alexcrichton
Copy link
Member

@bors: retry

On Thu, May 14, 2015 at 11:18 AM, bors [email protected] wrote:

[image: 💔] Test failed - auto-win-64-opt
http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/3460


Reply to this email directly or view it on GitHub
#25403 (comment).

@bors
Copy link
Collaborator

bors commented May 14, 2015

⌛ Testing commit 2df7ae6 with merge 571f371...

bors added a commit that referenced this pull request May 14, 2015
@bors
Copy link
Collaborator

bors commented May 14, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton
Copy link
Member

@bors: retry force

On Thu, May 14, 2015 at 2:32 PM, bors [email protected] wrote:

[image: 💔] Test failed - auto-linux-64-x-android-t
http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/4907


Reply to this email directly or view it on GitHub
#25403 (comment).

@bors
Copy link
Collaborator

bors commented May 14, 2015

@bors bors merged commit 2df7ae6 into rust-lang:master May 14, 2015
@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.

9 participants