Skip to content

Conversation

michaelsproul
Copy link
Contributor

I did a manual merge of all the extended error PRs as we were getting merge conflicts yesterday. I think this is preferable to merging separately as I ended up having to manually merge @nham and @GuillaumeGomez's commits.

Rollup of #24458, #24482 and #24488.
#24482 and #24488 were already re-approved, and would need to be cancelled if this is merged instead.

@rust-highfive
Copy link
Contributor

r? @huonw

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

@alexcrichton
Copy link
Member

@bors: r+ 50f75f3

Thanks!

@killercup
Copy link
Contributor

FYI, In the meantime #24552 was created that adds E0133.

@killercup
Copy link
Contributor

Also, #24525 adds E0018.

@michaelsproul
Copy link
Contributor Author

@killercup: These are just already approved ones. I'll do another roll up once the two PRs you mentioned are approved.

@GuillaumeGomez
Copy link
Member

@killercup: Mine still needs to be approved. It remains one sentence bad written.

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 18, 2015
I did a manual merge of all the extended error PRs as we were getting merge conflicts yesterday. I think this is preferable to merging separately as I ended up having to manually merge @nham and @GuillaumeGomez's commits.

Rollup of rust-lang#24458, rust-lang#24482 and rust-lang#24488.

rust-lang#24482 and rust-lang#24488 were already re-approved, and would need to be cancelled if this is merged instead.
bors added a commit that referenced this pull request Apr 18, 2015
@bors bors merged commit 50f75f3 into rust-lang:master Apr 18, 2015
@michaelsproul michaelsproul deleted the rollup branch April 18, 2015 23:09
@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