Skip to content

Conversation

GuillaumeGomez
Copy link
Member

r? @eddyb

@eddyb
Copy link
Member

eddyb commented Jun 28, 2017

r? @nikomatsakis
(for the record, I regret not letting this ICE)

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Jun 28, 2017
@bors
Copy link
Collaborator

bors commented Jun 29, 2017

☔ The latest upstream changes (presumably #42887) made this pull request unmergeable. Please resolve the merge conflicts.

@durka
Copy link
Contributor

durka commented Jun 29, 2017

This is a duplicate error code.

Compiling rustc_typeck v0.0.0 (file:///home/aburka/rust/src/librustc_typeck)
warning: diagnostic code E0619 already used
    --> src/librustc_typeck/check/mod.rs:4719:21
     |
4719 | /                     type_error_struct!(self.tcx.sess, sp, ty, E0619,
4720 | |                                        "the type of this value must be known in this context")
     | |______________________________________________________________________________________________^
     |
note: previous invocation
    --> src/librustc_typeck/check/intrinsic.rs:40:13
     |
40   | /             struct_span_err!(tcx.sess, it.span, E0619,
41   | |                              "intrinsic must be a function")
     | |____________________________________________________________^
     = note: this error originates in a macro outside of the current crate

@nikomatsakis
Copy link
Contributor

It does seem unclear why this requires a nice error... but ok. :)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 29, 2017

📌 Commit 2c86ff4 has been approved by nikomatsakis

@frewsxcv
Copy link
Contributor

@bors rollup

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 30, 2017
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
@shepmaster shepmaster added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 30, 2017
@GuillaumeGomez
Copy link
Member Author

Sorry, to avoid another conflict I moved this error code.

@bors: r=nikomatsakis rollup

@bors
Copy link
Collaborator

bors commented Jun 30, 2017

📌 Commit 162b5a3 has been approved by nikomatsakis

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
bors added a commit that referenced this pull request Jun 30, 2017
Rollup of 6 pull requests

- Successful merges: #42669, #42911, #42925, #42957, #42985, #42987
- Failed merges: #42936
@bors bors merged commit 162b5a3 into rust-lang:master Jul 1, 2017
@GuillaumeGomez GuillaumeGomez deleted the add-e0619 branch July 1, 2017 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants