Skip to content

Some tweaks to "type parameters from outer function" diagnostic - #49007

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:follow-up-47574
Mar 16, 2018
Merged

Some tweaks to "type parameters from outer function" diagnostic#49007
bors merged 1 commit into
rust-lang:masterfrom
estebank:follow-up-47574

Conversation

@estebank

@estebankestebank commented Mar 14, 2018

Copy link
Copy Markdown
Contributor

Follow up to #47574.

@rust-highfive

rust-highfive commented Mar 14, 2018

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2018
oli-obk
oli-obk requested changes Mar 14, 2018
View reviewed changes

@oli-obkoli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with comments addressed

Comment threadsrc/test/ui/error-codes/E0401.rs Outdated

@oli-obkoli-obkMar 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is called below, so you need to rename the call, too. Or just undo the rename

Comment threadsrc/librustc_resolve/lib.rs Outdated

@oli-obkoli-obkMar 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty line

Comment threadsrc/librustc_resolve/lib.rs Outdated

@oli-obkoli-obkMar 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be snippet.find(|c| !c.is_alphanumeric() && *c != '_').expect("no label after fn")

Comment threadsrc/librustc_resolve/lib.rs Outdated

@oli-obkoli-obkMar 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

@estebank
estebankforce-pushed the follow-up-47574 branch 3 times, most recently from e75da69 to 7cacfd2CompareMarch 14, 2018 18:07
@estebank

estebank commented Mar 14, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk rollup

@bors

bors commented Mar 14, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 16d424f has been approved by oli-obk

@borsbors added 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 Mar 14, 2018
@kennytmkennytm mentioned this pull request Mar 15, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 15, 2018
@kennytm
Rollup merge ofrust-lang#49007- estebank:follow-up-47574, r=oli-obk
5a7aa6c
Some tweaks to "type parameters from outer function" diagnostic
Follow up to rust-lang#47574.
bors added a commit that referenced this pull request Mar 16, 2018
@bors
Auto merge of#49051- kennytm:rollup, r=kennytm
36b6687
Rollup of 17 pull requests
- Successful merges: #48706, #48875, #48892, #48922, #48957, #48959, #48961, #48965, #49007, #49024, #49042, #49050, #48853, #48990, #49037, #49049, #48972
- Failed merges:
@bors
bors merged commit 16d424f into rust-lang:masterMar 16, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk requested changes

Assignees

@pnkfelixpnkfelix

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@estebank@rust-highfive@bors@oli-obk@pnkfelix