Skip to content

[const-prop] Remove useless typedef #67682

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jan 19, 2020

Conversation

wesleywiser
Copy link
Member

It's confusing because it conflicts with ty::Const and just isn't
generally useful.

@rust-highfive
Copy link
Contributor

r? @davidtwco

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2019
@Dylan-DPC-zz
Copy link

r? @Dylan-DPC

@Dylan-DPC-zz
Copy link

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 29, 2019

📌 Commit b174aec7c7c32f9d179d613c242668fc8b9cd937 has been approved by Dylan-DPC

@bors bors 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 Dec 29, 2019
@Dylan-DPC-zz
Copy link

Failed in rollup

@bors r-

@bors bors 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 Dec 29, 2019
@wesleywiser
Copy link
Member Author

There's a few const prop related PRs in flight right now. I'll wait a day or two for those to land and rebase this.

@wesleywiser wesleywiser force-pushed the remove_opty_const_typedef branch from b174aec to 512a7b1 Compare January 4, 2020 13:44
@wesleywiser
Copy link
Member Author

Rebased

@Dylan-DPC-zz
Copy link

can you run tidy over this?

It's confusing because it conflicts with ty::Const and just isn't
generally useful.
@wesleywiser wesleywiser force-pushed the remove_opty_const_typedef branch from 512a7b1 to a957f0d Compare January 18, 2020 23:45
@wesleywiser
Copy link
Member Author

Rebased and ran tidy

@Dylan-DPC-zz
Copy link

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 19, 2020

📌 Commit a957f0d has been approved by Dylan-DPC

@bors bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 19, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 19, 2020
…ef, r=Dylan-DPC

[const-prop] Remove useless typedef

It's confusing because it conflicts with `ty::Const` and just isn't
generally useful.
bors added a commit that referenced this pull request Jan 19, 2020
Rollup of 5 pull requests

Successful merges:

 - #67682 ([const-prop] Remove useless typedef)
 - #68133 (Slimmer syntax)
 - #68154 (Add more BTreeMap/BTreeSet benchmarks regarding iteration)
 - #68247 (Clean up err codes)
 - #68348 (Make iter::Empty<T> Send and Sync for any T)

Failed merges:

 - #68353 (Remove `rustc_error_codes` deps except in `rustc_driver`)

r? @ghost
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 19, 2020
…ef, r=Dylan-DPC

[const-prop] Remove useless typedef

It's confusing because it conflicts with `ty::Const` and just isn't
generally useful.
bors added a commit that referenced this pull request Jan 19, 2020
Rollup of 3 pull requests

Successful merges:

 - #67682 ([const-prop] Remove useless typedef)
 - #68247 (Clean up err codes)
 - #68348 (Make iter::Empty<T> Send and Sync for any T)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Jan 19, 2020

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

@bors bors 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 Jan 19, 2020
@bors bors merged commit a957f0d into rust-lang:master Jan 19, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants