Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update E0206 message to new format #35402

Merged
merged 1 commit into from Aug 8, 2016
Merged

Update E0206 message to new format #35402

merged 1 commit into from Aug 8, 2016

Conversation

KiChjang
Copy link
Member

@KiChjang KiChjang commented Aug 5, 2016

Part of #35233.
Fixes #35301.

r? @GuillaumeGomez

@KiChjang KiChjang force-pushed the e0206-new-msg branch 2 times, most recently from 91726cf to 5bab0e6 Compare August 6, 2016 04:10
@GuillaumeGomez
Copy link
Member

Great work, thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 6, 2016

📌 Commit 5bab0e6 has been approved by GuillaumeGomez

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 6, 2016
Rollup merge of rust-lang#35402 - KiChjang:e0206-new-msg, r=Guillaume…
ae59b96 
…Gomez

Update E0206 message to new format

Part of rust-lang#35233.
Fixes rust-lang#35301.

r? @GuillaumeGomez
@sophiajt sophiajt mentioned this pull request Aug 6, 2016
Closed
bors added a commit that referenced this pull request Aug 6, 2016
@bors
Auto merge of #35430 - jonathandturner:rollup, r=jonathandturner
f0d7e4e 
Rollup of 9 pull requests

- Successful merges: #35362, #35393, #35394, #35402, #35410, #35411, #35413, #35419, #35421
- Failed merges: #35395, #35415
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 7, 2016
Rollup merge of rust-lang#35402 - KiChjang:e0206-new-msg, r=Guillaume…
c67a142 
…Gomez

Update E0206 message to new format

Part of rust-lang#35233.
Fixes rust-lang#35301.

r? @GuillaumeGomez
@sophiajt sophiajt mentioned this pull request Aug 7, 2016
Closed
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 7, 2016
Rollup merge of rust-lang#35402 - KiChjang:e0206-new-msg, r=Guillaume…
d58d045 
…Gomez

Update E0206 message to new format

Part of rust-lang#35233.
Fixes rust-lang#35301.

r? @GuillaumeGomez
@sophiajt sophiajt mentioned this pull request Aug 7, 2016
Closed
@TimNN
Copy link
Contributor

TimNN commented Aug 7, 2016

From a local build of the rollup #35462 which included this PR, I believe that this PR causes the compile-fail tests E0206.rs and coherence-impls-copy.rs to fail due to missing notes, see #35462 (comment) for the full test output (I would guess that travis passed since the source branch is some commits behind rust-lang/rust/master).

@sophiajt
Copy link
Contributor

sophiajt commented Aug 7, 2016 •
edited

@TimNN - it may be the combination of PRs that are causing the failures, since TravisCI passed this one by itself.

Looking into it...

@TimNN
Copy link
Contributor

TimNN commented Aug 7, 2016

@jonathandturner

I would guess that travis passed since the source branch is some commits (edit: 100+) behind rust-lang/rust/master

@sophiajt
Copy link
Contributor

sophiajt commented Aug 7, 2016

@bors r-

Ah, I missed that.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 7, 2016

@KiChjang - can you make sure your PR is rebased against the latest master? This failure may be coming from something that was added after you first submitted your PR.

@KiChjang
Copy link
Member Author

KiChjang commented Aug 7, 2016 •
edited

I've rebased, but I didn't run into any merge conflicts. python src/bootstrap/bootstrap.py --step check-cfail --stage 1 also didn't return any errors.

@GuillaumeGomez
Copy link
Member

Let's give it a retry then (didn't see the problem the first time but whatever).

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 7, 2016

📌 Commit 413c321 has been approved by GuillaumeGomez

@KiChjang
Copy link
Member Author

KiChjang commented Aug 7, 2016

Wait, I see the problem. #35454 didn't update coherence-impls-copy.rs nor E0206.rs, so there's an extra note that wasn't expected.

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 7, 2016
Rollup merge of rust-lang#35402 - KiChjang:e0206-new-msg, r=Guillaume…
ce81500 
…Gomez

Update E0206 message to new format

Part of rust-lang#35233.
Fixes rust-lang#35301.

r? @GuillaumeGomez
@sophiajt sophiajt mentioned this pull request Aug 7, 2016
Closed
@GuillaumeGomez
Copy link
Member

@bors: r-

bors added a commit that referenced this pull request Aug 7, 2016
@bors
Auto merge of #35476 - jonathandturner:rollup, r=jonathandturner
8913330 
Rollup of 6 pull requests

- Successful merges: #35396, #35402, #35446, #35466, #35470, #35475
- Failed merges: #35395, #35415
@GuillaumeGomez
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 7, 2016

📌 Commit 53baa09 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Aug 8, 2016

⌛ Testing commit 53baa09 with merge 6153bbb...

bors added a commit that referenced this pull request Aug 8, 2016
@bors
Auto merge of #35402 - KiChjang:e0206-new-msg, r=GuillaumeGomez
6153bbb 
Update E0206 message to new format

Part of #35233.
Fixes #35301.

r? @GuillaumeGomez
@bors
Copy link
Contributor

bors commented Aug 8, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-no-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: GuillaumeGomez
Pushing 6153bbb to master...

@bors bors merged commit 53baa09 into rust-lang:master Aug 8, 2016
@KiChjang KiChjang deleted the e0206-new-msg branch August 8, 2016 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@GuillaumeGomez GuillaumeGomez

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@KiChjang @GuillaumeGomez @bors @TimNN @sophiajt