Skip to content

Duplicate ~const bounds with a non-const one in effects desugaring #116756

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 1 commit into from
Oct 17, 2023

Conversation

fee1-dead
Copy link
Member

This should unblock #116058.

r? @oli-obk

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 15, 2023
@fee1-dead fee1-dead force-pushed the dupe-those-bounds branch 2 times, most recently from 099d7e6 to 183f0d7 Compare October 15, 2023 08:58
@compiler-errors
Copy link
Member

So every ~const Foo bound gets desugared as Foo<host> + Foo<false>? If not, please leave a more detailed description of what this desugaring does and how it affects things like projection bounds.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 16, 2023

This lgtm, but I'd like an explanation somewhere why we aren't just elaborating the trait bound in

ty::PredicateKind::Clause(ty::ClauseKind::Trait(data)) => {
(where we add super trait bounds). I'm sure when I tried that there were all kinds of problems with it, but maybe your design could work?

@fee1-dead
Copy link
Member Author

(where we add super trait bounds). I'm sure when I tried that there were all kinds of problems with it, but maybe your design could work?

When I tried that, multiple tests fail, including project.rs, which is what this PR intends to fix

@oli-obk
Copy link
Contributor

oli-obk commented Oct 17, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 17, 2023

📌 Commit f0f89d6 has been approved by oli-obk

It is now in the queue for this repository.

@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 Oct 17, 2023
@bors
Copy link
Collaborator

bors commented Oct 17, 2023

⌛ Testing commit f0f89d6 with merge 616e379...

@bors
Copy link
Collaborator

bors commented Oct 17, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 616e379 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 17, 2023
@bors bors merged commit 616e379 into rust-lang:master Oct 17, 2023
@rustbot rustbot added this to the 1.75.0 milestone Oct 17, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (616e379): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 626.67s -> 626.338s (-0.05%)
Artifact size: 305.60 MiB -> 305.62 MiB (0.01%)

@fee1-dead fee1-dead deleted the dupe-those-bounds branch October 18, 2023 05:49
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Oct 18, 2023
57: Pull upstream master 2023 10 18 r=pietroalbini a=Veykril

* rust-lang/rust#116505
* rust-lang/rust#116840
* rust-lang/rust#116767
* rust-lang/rust#116855
  * rust-lang/rust#116827
  * rust-lang/rust#116787
  * rust-lang/rust#116719
  * rust-lang/rust#116717
  * rust-lang/rust#111072
* rust-lang/rust#116844
* rust-lang/rust#115577
* rust-lang/rust#116756
* rust-lang/rust#116518



Co-authored-by: Urgau <urgau@numericable.fr>
Co-authored-by: Esteban Küber <esteban@kuber.com.ar>
Co-authored-by: Deadbeef <ent3rm4n@gmail.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: Camille GILLOT <gillot.camille@gmail.com>
Co-authored-by: Celina G. Val <celinval@amazon.com>
Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com>
Co-authored-by: Arthur Lafrance <lafrancearthur@gmail.com>
Co-authored-by: Nikolay Arhipov <n@arhipov.net>
Co-authored-by: Nikita Popov <npopov@redhat.com>
Co-authored-by: bors <bors@rust-lang.org>
# for free to join this conversation on GitHub. Already have an account? # 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. 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.

6 participants