Skip to content

Do not suggest .into() in consts - #49157

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:const-into
Mar 20, 2018
Merged

Do not suggest .into() in consts#49157
bors merged 1 commit into
rust-lang:masterfrom
estebank:const-into

Conversation

@estebank

@estebankestebank commented Mar 19, 2018

Copy link
Copy Markdown
Contributor

Fix#49100.

@estebank

estebank commented Mar 19, 2018

Copy link
Copy Markdown
ContributorAuthor

r? @oli-obk

@estebankestebank added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2018
oli-obk
oli-obk requested changes Mar 19, 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 nit addressed

Comment threadsrc/test/ui/suggestions/const-type-mismatch.stderr Outdated

@oli-obkoli-obkMar 19, 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.

travis is unhappy with this empty trailing line

@estebank

estebank commented Mar 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk rollup

@bors

bors commented Mar 19, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1b8f1fc 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 19, 2018
@kennytmkennytm mentioned this pull request Mar 19, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 20, 2018
@kennytm
Rollup merge ofrust-lang#49157- estebank:const-into, r=oli-obk
cfb5317
Do not suggest `.into()` in `const`s
Fixrust-lang#49100.
bors added a commit that referenced this pull request Mar 20, 2018
@bors
Auto merge of#49190- kennytm:rollup, r=kennytm
75af15e
Rollup of 17 pull requests
- Successful merges: #46518, #48810, #48834, #48902, #49004, #49092, #49096, #49099, #49104, #49125, #49139, #49152, #49157, #49161, #49166, #49176, #49184
- Failed merges:
@bors

bors commented Mar 20, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@bors
bors merged commit 1b8f1fc into rust-lang:masterMar 20, 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

@oli-obkoli-obk

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@estebank@bors@oli-obk