Skip to content

use implied bounds compat mode in MIR borrowck #120123

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

Jump to bottom
Merged
merged 1 commit into from
Jan 19, 2024
Merged

use implied bounds compat mode in MIR borrowck #120123

merged 1 commit into from
Jan 19, 2024

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jan 19, 2024

cc

This should hopefully fix bevy 🤔 cargo test ends up freezing my computer though, cargo build went from err to ok however 😁

r? @jackh726

@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 Jan 19, 2024
jackh726
jackh726 reviewed Jan 19, 2024
View reviewed changes
tests/ui/implied-bounds/normalization-nested-no-compat.rs Outdated
Comment on lines 4 to 5
// FIXME(-Zno-implied-bounds-compat): remove this test once this flag is removed,
// duplicate of `normalization-nested.rs`.
Copy link
Member

Choose a reason for hiding this comment

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

Can you just make 4 revisions in normalization-nested? lifetime or param x compat or non-comat?

@jackh726
Copy link
Member

@bors rollup=never p=1

r=me, preferably with the new test combined into the previous with revisions (and confirmation that the bevy regression is covered)

@lcnr
Copy link
Contributor Author

lcnr commented Jan 19, 2024

@bors r=jackh726

@bors
Copy link
Collaborator

bors commented Jan 19, 2024

📌 Commit 058ab53 has been approved by jackh726

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 Jan 19, 2024
@bors
Copy link
Collaborator

bors commented Jan 19, 2024

⌛ Testing commit 058ab53 with merge 897232d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2024
@bors
Auto merge of rust-lang#120123 - lcnr:sadboi-compat, r=jackh726
897232d 
use implied bounds compat mode in MIR borrowck

cc
- rust-lang#119956
- rust-lang#118553

This should hopefully fix bevy 🤔 `cargo test` ends up freezing my computer though, cargo build went from err to ok however 😁

r? `@jackh726`
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-debug failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Collaborator

bors commented Jan 19, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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, 2024
@workingjubilee
Copy link
Member

Identified as spurious network error.
@bors retry

@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 Jan 19, 2024
@jackh726 jackh726 mentioned this pull request Jan 19, 2024
Merged
@bors
Copy link
Collaborator

bors commented Jan 19, 2024

⌛ Testing commit 058ab53 with merge 88189a7...

@bors
Copy link
Collaborator

bors commented Jan 19, 2024

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 88189a7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 19, 2024
@bors bors merged commit 88189a7 into rust-lang:master Jan 19, 2024
@rustbot rustbot added this to the 1.77.0 milestone Jan 19, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (88189a7): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.9% [0.9%, 1.0%] 4
Improvements ✅
(primary)		 -0.7% [-0.9%, -0.6%] 6
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.7% [-0.9%, -0.6%] 6

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)		 4.7% [4.7%, 4.7%] 1
Improvements ✅
(primary)		 -1.4% [-1.4%, -1.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -1.4% [-1.4%, -1.4%] 1

Cycles

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

Binary size

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.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

Bootstrap: 664.714s -> 663.584s (-0.17%)
Artifact size: 308.27 MiB -> 308.31 MiB (0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Jan 19, 2024
@alice-i-cecile alice-i-cecile mentioned this pull request Jan 21, 2024
Merged
@lcnr lcnr deleted the sadboi-compat branch January 22, 2024 06:46
github-merge-queue bot pushed a commit to bevyengine/bevy that referenced this pull request Jan 22, 2024
@alice-i-cecile @mockersf
Unpin nightly for miri (#11462)
1d17453 
# Objective

- Using the latest nightly for `miri` is generally desirable as we want
to catch regressions upstream or new problems quickly
- rust-lang/rust#120123 should be merged now, so
it should work.

## Solution

- Revert #11421.

---------

Co-authored-by: François <mockersf@gmail.com>
Co-authored-by: Alice Cecile <alice.i.cecil@gmail.com>
@Kobzol
Copy link
Member

Kobzol commented Jan 23, 2024

Wins outweigh the losses, but wg-grammar has been behaving frantically lately, anyway.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jan 23, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@jackh726 jackh726 jackh726 left review comments

Assignees

@jackh726 jackh726

Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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.77.0
Development

Successfully merging this pull request may close these issues.
8 participants
@lcnr @jackh726 @bors @rust-log-analyzer @workingjubilee @rust-timer @Kobzol @rustbot