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

Rename tests/ui/issues/issue-100605.rs to ../type/option-ref-advice.rs #114143

Merged
merged 1 commit into from
Aug 5, 2023
Merged

Rename tests/ui/issues/issue-100605.rs to ../type/option-ref-advice.rs #114143

merged 1 commit into from
Aug 5, 2023

Conversation

Enselic
Copy link
Member

@Enselic Enselic commented Jul 27, 2023 •
edited
Loading

The test is a regression test for a bug where the compiler gave bad advice for an Option<&String>. Rename the file appropriately.

Part of #73494

@rustbot
Copy link
Collaborator

rustbot commented Jul 27, 2023

r? @eholk

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 27, 2023
@Enselic
Copy link
Member Author

Enselic commented Jul 27, 2023

@rustbot label -T-bootstrap

@rustbot rustbot removed the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 27, 2023
@bors
Copy link
Contributor

bors commented Jul 28, 2023

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

eholk
eholk reviewed Aug 4, 2023
View reviewed changes
src/tools/tidy/src/issues.txt Outdated Show resolved Hide resolved
@eholk
Copy link
Contributor

eholk commented Aug 4, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Aug 4, 2023

📌 Commit bde557b5ea2420cb29a68eb68f0c5e6cdc59504a has been approved by eholk

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 Aug 4, 2023
@eholk
Copy link
Contributor

eholk commented Aug 4, 2023

Ah, looks like there are conflicts. Feel free to r=me after resolving them.

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Aug 4, 2023
@bors
Copy link
Contributor

bors commented Aug 4, 2023

☔ The latest upstream changes (presumably #114481) 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 Aug 4, 2023
@Enselic
Copy link
Member Author

Enselic commented Aug 5, 2023

Thanks for review!

@bors r=eholk

@bors
Copy link
Contributor

bors commented Aug 5, 2023

@Enselic: 🔑 Insufficient privileges: Not in reviewers

@Enselic
Copy link
Member Author

Enselic commented Aug 5, 2023

@eholk (You need to @bors delegate+ me first)

@bors
Copy link
Contributor

bors commented Aug 5, 2023

@Enselic: 🔑 Insufficient privileges: Not in reviewers

@Enselic
Copy link
Member Author

Enselic commented Aug 5, 2023

@rustbot ready (see #114143 (comment))

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 5, 2023
@eholk
Copy link
Contributor

eholk commented Aug 5, 2023

@bors r+

Sorry about that!

@bors
Copy link
Contributor

bors commented Aug 5, 2023

📌 Commit 76ce67292cd220f5e8635c88423948e6d02c1525 has been approved by eholk

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 Aug 5, 2023
@klensy
Copy link
Contributor

klensy commented Aug 5, 2023

https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy Squash please.

@Enselic
Rename tests/ui/issues/issue-100605.rs to ../type/option-ref-advice.rs
6ba393c 
The test is a regression test for a bug where the compiler gave bad
advice for an `Option<&String>`. Rename the file appropriately.
@Enselic Enselic force-pushed the rename-issue-100605 branch from 76ce672 to 6ba393c Compare August 5, 2023 13:36
@Enselic
Copy link
Member Author

Enselic commented Aug 5, 2023

@klensy Done! Would be good to let PR CI catch this if it is a strict policy.

@eholk You need to r+ again!

@klensy
Copy link
Contributor

klensy commented Aug 5, 2023

@klensy Done! Would be good to let PR CI catch this if it is a strict policy.

#114157

@eholk
Copy link
Contributor

eholk commented Aug 5, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Aug 5, 2023

📌 Commit 6ba393c has been approved by eholk

It is now in the queue for this repository.

@eholk
Copy link
Contributor

eholk commented Aug 5, 2023

@bors delegate @Enselic

(Just in case you need another r+)

@bors
Copy link
Contributor

bors commented Aug 5, 2023

⌛ Testing commit 6ba393c with merge 9565b68...

@bors
Copy link
Contributor

bors commented Aug 5, 2023

☀️ Test successful - checks-actions
Approved by: eholk
Pushing 9565b68 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 5, 2023
@bors bors merged commit 9565b68 into rust-lang:master Aug 5, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 5, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9565b68): comparison URL.

Overall result: ✅ improvements - 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.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.2% [-0.2%, -0.2%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.2% [-0.2%, -0.2%] 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.

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

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.

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

Binary size

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

Bootstrap: 648.941s -> 649.206s (0.04%)

@Enselic Enselic deleted the rename-issue-100605 branch August 6, 2023 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eholk eholk eholk left review comments

Assignees

@eholk eholk

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Enselic @rustbot @bors @eholk @klensy @rust-timer