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.

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

Clean up TypeFlags #69469

Merged
merged 2 commits into from
Mar 2, 2020
Merged

Clean up TypeFlags #69469

merged 2 commits into from
Mar 2, 2020

Conversation

matthewjasper
Copy link
Contributor

  • Add a new method has_infer_types_or_consts that's used instead of has_infer_types most of the time, since there's generally no reason to only consider types.
  • Remove has_closure_types/HAS_TY_CLOSURE, because closures are no longer implicitly linked to the InferCtxt.
  • Reorder flags to group similar ones together
  • Make some flags more granular
  • Compute HAS_FREE_LOCAL_NAMES from the other flags
  • Add some more doc comments

@rust-highfive
Copy link
Collaborator

r? @cramertj

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

@matthewjasper matthewjasper changed the title Type flags Clean up TypeFlags Feb 25, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 25, 2020
@cramertj
Copy link
Member

r=me with travis

@matthewjasper
Copy link
Contributor Author

@bors r=cramertj

@bors
Copy link
Contributor

bors commented Feb 26, 2020

📌 Commit df3bd258a562fec3e8d44ab261342d1c1741945c has been approved by cramertj

@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 Feb 26, 2020
@bors
Copy link
Contributor

bors commented Mar 1, 2020

☔ The latest upstream changes (presumably #69612) 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 Mar 1, 2020
* Add a new method `has_infer_types_or_consts` that's used instead most
  of the time, since there's generally no reason to only consider types.
*  Remove use of `has_closure_types`, because closures are no longer
  implicitly linked to the `InferCtxt`.
* Reorder flags to group similar ones together
* Make some flags more granular
* Compute `HAS_FREE_LOCAL_NAMES` from the other flags
* Remove `HAS_TY_CLOSURE`
* Add some more doc comments
@matthewjasper
Copy link
Contributor Author

@bors r=cramertj

@bors
Copy link
Contributor

bors commented Mar 1, 2020

📌 Commit 1617ec4 has been approved by cramertj

@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 Mar 1, 2020
@bors
Copy link
Contributor

bors commented Mar 2, 2020

⌛ Testing commit 1617ec4 with merge 6af4fd3...

@bors
Copy link
Contributor

bors commented Mar 2, 2020

☀️ Test successful - checks-azure
Approved by: cramertj
Pushing 6af4fd3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 2, 2020
@bors bors merged commit 6af4fd3 into rust-lang:master Mar 2, 2020
@ehuss ehuss mentioned this pull request Mar 2, 2020
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Mar 2, 2020
@matthewjasper matthewjasper deleted the type-flags branch March 2, 2020 19:40
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Mar 2, 2020
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 2, 2020
bors added a commit that referenced this pull request Mar 2, 2020
Update cargo, clippy

Closes #69601

## cargo

16 commits in e57bd02999c9f40d52116e0beca7d1dccb0643de..bda50510d1daf6e9c53ad6ccf603da6e0fa8103f
2020-02-21 20:20:10 +0000 to 2020-03-02 18:05:34 +0000
- Fix rare failure in collision_export test. (rust-lang/cargo#7956)
- Ignore broken Cargo.toml in git sources (rust-lang/cargo#7947)
- Add more fingerprint mtime debug logging. (rust-lang/cargo#7952)
- Fix plugin tests for latest nightly. (rust-lang/cargo#7955)
- Simplified usage code of SipHasher (rust-lang/cargo#7945)
- Add a special case for git config discovery inside tests (rust-lang/cargo#7944)
- Fixes issue rust-lang/cargo#7543 (rust-lang/cargo#7946)
- Filter out cfgs which should not be used during build (rust-lang/cargo#7943)
- Provide extra context on a query failure. (rust-lang/cargo#7934)
- Try to clarify `cargo metadata`'s relationship with the workspace. (rust-lang/cargo#7927)
- Update libgit2 dependency (rust-lang/cargo#7939)
- Fix link in comment (rust-lang/cargo#7936)
- Enable `cargo doc --open` tests on macos. (rust-lang/cargo#7932)
- build-std: remove sysroot probe (rust-lang/cargo#7931)
- Try to clarify how feature flags work on the "current" package. (rust-lang/cargo#7928)
- Add extra details in the new feature resolver doc comment. (rust-lang/cargo#7918)

## clippy

6 commits in fc5d0cc..8b7f7e6
2020-02-24 05:58:17 +0000 to 2020-03-02 20:00:31 +0000
- Rustup to #69469 (rust-lang/rust-clippy#5254)
- Some rustups (rust-lang/rust-clippy#5247)
- Update git2 to 0.12 (rust-lang/rust-clippy#5232)
- Rustup to #61812 (rust-lang/rust-clippy#5231)
- Add lint to improve floating-point expressions (rust-lang/rust-clippy#4897)
- Do not run deploy action on other repos (rust-lang/rust-clippy#5222)
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 17, 2020
…ikomatsakis

Ensure HAS_FREE_LOCAL_NAMES is set for ReFree

This fixes a bug introduced by rust-lang#69469.
I don't have any ideas on how to reate a regression test for this.
Centril added a commit to Centril/rust that referenced this pull request Mar 17, 2020
…ikomatsakis

Ensure HAS_FREE_LOCAL_NAMES is set for ReFree

This fixes a bug introduced by rust-lang#69469.
I don't have any ideas on how to reate a regression test for this.
Centril added a commit to Centril/rust that referenced this pull request Mar 17, 2020
…ikomatsakis

Ensure HAS_FREE_LOCAL_NAMES is set for ReFree

This fixes a bug introduced by rust-lang#69469.
I don't have any ideas on how to reate a regression test for this.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

4 participants