Skip to content

Rollup of 5 pull requests #121955

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 14 commits into from
Mar 4, 2024
Merged

Rollup of 5 pull requests #121955

merged 14 commits into from
Mar 4, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GilShoshan94 and others added 14 commits February 28, 2024 16:55
Co-authored-by: Jieyou Xu <jieyouxu@outlook.com>
We're trying to test lint behavior, not per-target crate-type support.
This is the second time I'm doing this... I'm starting to feel like
stage1 ui-fulldeps tests were a mistake. Maybe I should have just put
`#[cfg(bootstrap)]` there to let the bootstrap bumper fix it.
…=petrochenkov

Consider middle segments of paths in `unused_qualifications`

Currently `unused_qualifications` looks at the last segment of a path to see if it can be trimmed, this PR extends the check to the middle segments also

```rust
// currently linted
use std::env::args();
std::env::args(); // Removes `std::env::`
```
```rust
// newly linted
use std::env;
std::env::args(); // Removes `std::`
```

Paths with generics in them are now linted as long as the part being trimmed is before any generic args, e.g. it will now suggest trimming `std::vec::` from `std::vec::Vec<usize>`

Paths with any segments that are from an expansion are no longer linted

Fixes rust-lang#100979
Fixes rust-lang#96698
…henkov

Don't lint on executable crates with `non_snake_case` names

Revives rust-lang#111130, cc `@GilShoshan94.`
Closes rust-lang#45127.
library/ptr: mention that ptr::without_provenance is equivalent to deriving from the null ptr

This might help clarify why you can't do memory accesses with it.
…r-errors

Run some ui-fulldeps tests on stage 1 again

This is the second time I'm doing this... I'm starting to feel like stage1 ui-fulldeps tests were a mistake. Maybe I should have just put `#[cfg(bootstrap)]` there to let the bootstrap bumper fix it.

`@George-lewis` :)

finishes rust-lang#119088 (comment)
@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 3, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 3, 2024

📌 Commit e5a6d21 has been approved by matthiaskrgr

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 Mar 3, 2024
@bors
Copy link
Collaborator

bors commented Mar 3, 2024

⌛ Testing commit e5a6d21 with merge 3fb9000...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#121248 (Move some tests)
 - rust-lang#121528 (Consider middle segments of paths in `unused_qualifications`)
 - rust-lang#121749 (Don't lint on executable crates with `non_snake_case` names)
 - rust-lang#121935 (library/ptr: mention that ptr::without_provenance is equivalent to deriving from the null ptr)
 - rust-lang#121945 (Run some ui-fulldeps tests on stage 1 again)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Mar 3, 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 Mar 3, 2024
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
SCRIPT=./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
SELECT_XCODE=/Applications/Xcode_14.3.1.app
SHELL=/bin/bash
SHLVL=3
SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.NxRyxmS5Cx/Listeners
STATS_EXTP=https://provjobdsettingscdn.blob.core.windows.net/settings/provjobdsettings-0.5.154/provjobd.data
STATS_RDCL=true
STATS_TIS=mining
STATS_TRP=true

@matthiaskrgr
Copy link
Member Author

@bors retry
warning: spurious network error (2 tries remaining): [6] Couldn't resolve host name (Could not resolve host: index.crates.io)

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

bors commented Mar 4, 2024

⌛ Testing commit e5a6d21 with merge 89b7830...

@bors
Copy link
Collaborator

bors commented Mar 4, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 89b7830 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 4, 2024
@bors bors merged commit 89b7830 into rust-lang:master Mar 4, 2024
@rustbot rustbot added this to the 1.78.0 milestone Mar 4, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#121248 Move some tests 176f251a3d3988f418816f67d7363d5efb92e2bf (link)
#121528 Consider middle segments of paths in unused_qualifications f6ee0c0d7e340bf27eed847964571921caafed7c (link)
#121749 Don't lint on executable crates with non_snake_case names cdb0b9aee0b3d705ad580a3b66bb122738653c08 (link)
#121935 library/ptr: mention that ptr::without_provenance is equiva… cfb38919908ebc22b7d041275c9378b6293cb1d1 (link)
#121945 Run some ui-fulldeps tests on stage 1 again 7c81387458f1b94b2435e96eaacb696ed407299d (link)

previous master: 70aa0b86c0

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (89b7830): 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.7% [0.2%, 3.7%] 17
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.8%, -0.2%] 10
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [-0.8%, 3.7%] 27

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

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

Binary size

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

Bootstrap: 644.02s -> 643.72s (-0.05%)
Artifact size: 174.95 MiB -> 175.01 MiB (0.03%)

@rustbot rustbot added the perf-regression Performance regression. label Mar 4, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Mar 4, 2024

@rust-timer build f6ee0c0

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f6ee0c0): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

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.7% [0.3%, 2.6%] 14
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.8%, -0.2%] 11
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [-0.8%, 2.6%] 25

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)
-4.6% [-4.6%, -4.6%] 1
Improvements ✅
(secondary)
-2.4% [-2.8%, -2.1%] 2
All ❌✅ (primary) -4.6% [-4.6%, -4.6%] 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)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.4% [2.4%, 2.4%] 1

Binary size

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

Bootstrap: 644.02s -> 643.036s (-0.15%)
Artifact size: 174.95 MiB -> 175.00 MiB (0.03%)

@Kobzol
Copy link
Contributor

Kobzol commented Mar 4, 2024

Looks like the regressions come from #121528. It seems to be a correctness fix, so I think it's fine, but just CCing @petrochenkov to check if this is expected.

@matthiaskrgr matthiaskrgr deleted the rollup-1i3lo0j branch March 16, 2024 18:18
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.