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.

Sign up for GitHub

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

Jump to bottom

Re-add HRTB implied static bug note #101924

Merged
merged 9 commits into from
Sep 19, 2022
Merged

Re-add HRTB implied static bug note #101924

merged 9 commits into from
Sep 19, 2022

Conversation

jackh726
Copy link
Member

r? @compiler-errors since you reviewed it previously

I deleted a normalize call and forgot about it. Whoops.

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 17, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2022
@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2022

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@jackh726
Copy link
Member Author

Going to beta nominate this for 1.65. It would be nice to have this note alongside the GATs stabilization.

@jackh726 jackh726 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 17, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jackh726 jackh726 force-pushed the revert-static-hrtb-error branch from 529efa7 to e5756e0 Compare September 17, 2022 15:32
jackh726
jackh726 commented Sep 17, 2022
View reviewed changes
compiler/rustc_traits/src/type_op.rs Outdated
hir::CRATE_HIR_ID,
ObligationCauseCode::AscribeUserTypeProvePredicate(predicate_span),
);
let instantiated_predicate = self.normalize_with_cause(instantiated_predicate, cause.clone());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and adding the function are the only differences from the previous PR

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jackh726 jackh726 force-pushed the revert-static-hrtb-error branch from e5756e0 to e7ca6e1 Compare September 17, 2022 15:47
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 18, 2022

📌 Commit e7ca6e1 has been approved by compiler-errors

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 Sep 18, 2022
@bors
Copy link
Contributor

bors commented Sep 19, 2022

⌛ Testing commit e7ca6e1 with merge efa717b...

@bors
Copy link
Contributor

bors commented Sep 19, 2022

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing efa717b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 19, 2022
@bors bors merged commit efa717b into rust-lang:master Sep 19, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 19, 2022
@bors bors mentioned this pull request Sep 19, 2022
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (efa717b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)		 0.3% [0.3%, 0.3%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.3% [0.3%, 0.3%] 1

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.

mean1 range count2
Regressions ❌
(primary)		 1.2% [0.8%, 1.7%] 9
Regressions ❌
(secondary)		 3.4% [3.4%, 3.4%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.0% [-3.0%, -3.0%] 1
All ❌✅ (primary) 1.2% [0.8%, 1.7%] 9

Cycles

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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.7% [-1.7%, -1.7%] 1
Improvements ✅
(secondary)		 -2.4% [-3.1%, -1.8%] 15
All ❌✅ (primary) -1.7% [-1.7%, -1.7%] 1

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 22, 2022
@cuviper cuviper mentioned this pull request Oct 4, 2022
Merged
@cuviper cuviper modified the milestones: 1.66.0, 1.65.0 Oct 4, 2022
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 10, 2022
@bors
Auto merge of rust-lang#102676 - cuviper:beta-next, r=cuviper
da7ffa2 
[beta] backports

* Avoid duplicating StorageLive in let-else rust-lang#101894
* Re-add HRTB implied static bug note rust-lang#101924
* Revert "Copy stage0 binaries into stage0-sysroot" rust-lang#101942
* implied_bounds: deal with inference vars rust-lang#102016
* fix ConstProp handling of written_only_inside_own_block_locals rust-lang#102045
* Fix wrongly refactored Lift impl rust-lang#102088
* Fix a typo “pararmeter” in error message rust-lang#102119
* Deny associated type bindings within associated type bindings rust-lang#102338
* Continue migration of CSS themes rust-lang#101934
* Fix search result colors rust-lang#102369
* Fix unwind drop glue for if-then scopes rust-lang#102394
* Revert "Use getentropy when possible on all Apple platforms" rust-lang#102693
* Fix associated type bindings with anon const in GAT position rust-lang#102336
* Revert perf-regression 101620 rust-lang#102064
* `EscapeAscii` is not an `ExactSizeIterator` rust-lang#99880
@jackh726 jackh726 deleted the revert-static-hrtb-error branch October 23, 2022 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@compiler-errors compiler-errors

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic beta-accepted Accepted for backporting to the compiler in the beta channel. 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
Milestone
1.65.0
Development

Successfully merging this pull request may close these issues.
9 participants
@jackh726 @rustbot @rust-log-analyzer @compiler-errors @bors @rust-timer @apiraino @cuviper @rust-highfive