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

improve comments for simplify_type #94057

Merged
merged 2 commits into from
Mar 4, 2022
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Feb 16, 2022

Should now correctly describe what's going on. Experimented with checking the invariant for projections
but that ended up requiring fairly involved changes. I assume that it is not possible to get unsoundness here,
at least for now and I can pretty much guarantee that it's impossible to trigger it by accident.

r? @nikomatsakis cc #92721

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 16, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 16, 2022
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 17, 2022

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

@lcnr lcnr force-pushed the simplify_type-uwu branch from 1e1ca93 to 4675fcc Compare February 21, 2022 12:45
@lcnr lcnr changed the title assert correctness of simplify_type improve comments for simplify_type Feb 21, 2022
@lcnr lcnr marked this pull request as ready for review February 21, 2022 12:51
@lcnr lcnr force-pushed the simplify_type-uwu branch 2 times, most recently from c95a2ae to 0efb883 Compare February 21, 2022 12:52
@lcnr lcnr force-pushed the simplify_type-uwu branch from 0efb883 to 55f938b Compare February 21, 2022 12:53
Co-authored-by: Rémy Rakic <[email protected]>
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 3, 2022

📌 Commit ba2e0ca has been approved by nikomatsakis

@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 Mar 3, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 3, 2022
improve comments for `simplify_type`

Should now correctly describe what's going on. Experimented with checking the invariant for projections
but that ended up requiring fairly involved changes. I assume that it is not possible to get unsoundness here,
at least for now and I can pretty much guarantee that it's impossible to trigger it by accident.

r? ````@nikomatsakis```` cc rust-lang#92721
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2022
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#92697 (Use cgroup quotas for calculating `available_parallelism`)
 - rust-lang#94057 (improve comments for `simplify_type`)
 - rust-lang#94547 (`parse_tt` cleanups)
 - rust-lang#94550 (rustdoc: Add test for higher kinded functions generated by macros)
 - rust-lang#94551 (Doc: Fix use of quote instead of backstick in Adapter::map.)
 - rust-lang#94554 (Fix invalid lint_node_id being put on a removed stmt)
 - rust-lang#94555 (all: fix some typos)
 - rust-lang#94563 (Remove a unnecessary `..` pattern)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fec7a79 into rust-lang:master Mar 4, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 4, 2022
@lcnr lcnr deleted the simplify_type-uwu branch March 7, 2022 06:49
bors added a commit to rust-lang-ci/rust that referenced this pull request May 19, 2022
`simplify_type` improvements and cursed docs

the existing `TreatParams` enum pretty much mixes everything up. Not sure why this looked right to me in rust-lang#94057

This also includes two changes which impact perf:
- `ty::Projection` with inference vars shouldn't be treated as a rigid type, even if fully normalized
- `ty::Placeholder` only unifies with itself, so actually return `Some` for them

r? `@nikomatsakis`
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants