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

Rollup of 7 pull requests #126108

Merged
merged 18 commits into from
Jun 7, 2024
Merged

Rollup of 7 pull requests #126108

merged 18 commits into from
Jun 7, 2024

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

diondokter and others added 18 commits May 27, 2024 11:08
@diondokter
Size optimize int formatting
d32d1c1
@compiler-errors
Make middle not rely on next_trait_solver
c74efbc
@compiler-errors
Uplift TypeError
82ef3ad
@compiler-errors
Uplift TypeRelation and Relate
91274c8
@Urgau
Don't warn on fields in the unreachable_pub lint
89d86ae
@Kobzol
Remove same-lib-two-locations-no-panic run-make test
a5429d5 
This test doesn't really make any sense anymore, it became broken a long time ago.
@Noratrieb
Remove constant parameter from CrateLocator::new
3a02cdb
@Noratrieb
Simplify string operations in crate loader
4c2b21a
@Noratrieb
Improve naming and path operations in crate loader
b4c439c 
Simplify the path operation with `join`, clarify some of the names.
@lqd
Revert "Rollup merge of rust-lang#124099 - voidc:disallow-ambiguous-e…
216424d 
…xpr-attrs, r=davidtwco"

This reverts commit 57dad1d, reversing
changes made to 36316df.
@veera-sivarajan
Improve Docs for hir::Impl and hir::ImplItem
cddf291
@workingjubilee
Rollup merge of rust-lang#125606 - diondokter:opt-size-int-fmt, r=cuv…
c6cdd45 
…iper

Size optimize int formatting

Let's use the new feature flag!

This uses a simpler algorithm to format integers.
It is slower, but also smaller.
It also saves having to import the 200 byte rodata lookup table.

In a test of mine this saves ~300 bytes total of a cortex-m binary that does integer formatting.
For a 16KB device, that's almost 2%.

Note though that for opt-level 3 the text size actually grows by 116 bytes.
Still a win in total. I'm not sure why the generated code is bigger than the more fancy algo. Maybe the smaller algo lends itself more to inlining and duplicating?
@workingjubilee
Rollup merge of rust-lang#125724 - compiler-errors:uplift-relate, r=lcnr
75aa9d1 
Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`

For use in the new solver. This doesn't yet uplift `ObligationEmittingRelation`.

r? lcnr
@workingjubilee
Rollup merge of rust-lang#126040 - Urgau:unreachable_pub-fields-less,…
6a42df7 
… r=petrochenkov

Don't warn on fields in the `unreachable_pub` lint

This PR restrict the `unreachable_pub` lint by not linting on `pub` fields of `pub(restricted)` structs and unions. This is done because that can quickly clutter the code for an uncertain value, in particular since the "real" visibility is defined by the parent (the struct it-self).

This is meant to address one of the last concern of the `unreachable_pub` lint.

r? ``@petrochenkov``
@workingjubilee
Rollup merge of rust-lang#126098 - Kobzol:remove-same-lib-runmake-tes…
2acb24c 
…t, r=jieyouxu

Remove `same-lib-two-locations-no-panic` run-make test

This test doesn't really make any sense anymore, it became broken a long time ago.

r? ``@jieyouxu``
@workingjubilee
Rollup merge of rust-lang#126099 - Nilstrieb:crate-loader-cleanups, r…
4c771d3 
…=jieyouxu

Crate loader cleanups

Minor cleanups I found while trying to understand how all of this works
@workingjubilee
Rollup merge of rust-lang#126101 - lqd:revert-124099, r=wesleywiser
b1ab8d5 
Revert "Disallow ambiguous attributes on expressions" on nightly

As discussed in [today's t-compiler meeting](https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202024-06-06/near/443079505), this reverts PR rust-lang#124099 to fix P-critical beta regressions rust-lang#125199.

r? ``@wesleywiser``

Opening as draft so that ``@wesleywiser`` and ``@apiraino,`` you can tell me whether you wanted:
1. a `beta-accepted` revert of rust-lang#124099 on nightly (this PR)? That will need to be backported to beta (even though rust-lang#126093 may be the last of those)
2. a revert of rust-lang#124099 on beta?
3. all of the above?

I also opened rust-lang#126102, another draft PR to revert rust-lang#124099 on beta, should you choose options 2 or 3.
@workingjubilee
Rollup merge of rust-lang#126103 - veera-sivarajan:improve-docs-hir-i…
9436304 
…mpl, r=fmease

Improve Docs for `hir::Impl` and `hir::ImplItem`

Based on https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/.E2.9C.94.20Difference.20between.20.60hir.3A.3AImplItem.60.20and.20.60hir.3A.3AImpl.60.3F/near/442650915

r​? fmease
@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative rollup A PR which is a rollup labels Jun 7, 2024
@workingjubilee
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jun 7, 2024

📌 Commit 9436304 has been approved by workingjubilee

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

bors commented Jun 7, 2024

⌛ Testing commit 9436304 with merge 468310e...

@bors bors mentioned this pull request Jun 7, 2024
Merged
@bors
Copy link
Contributor

bors commented Jun 7, 2024

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 468310e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 7, 2024
@bors bors merged commit 468310e into rust-lang:master Jun 7, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 7, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#125606 Size optimize int formatting 3ff820a8f6d166404dffeea0f1b17bc27ae30bfc (link)
#125724 Uplift Relate/TypeRelation into `rustc_next_trait_solve… 68115da6ba943e810b560fdd609d0e0162d5ba7d (link)
#126040 Don't warn on fields in the unreachable_pub lint 56a59eaf4d9da2829d4a002ef3200e9574770456 (link)
#126098 Remove same-lib-two-locations-no-panic run-make test 160c311f3dede2729a1720a4078d7c4bb3b4c63a (link)
#126099 Crate loader cleanups d9edf050ab8eb0fa324215c44439523ea74ce615 (link)
#126101 Revert "Disallow ambiguous attributes on expressions" on ni… 73761692104f7293f9fd4fa8cef76967ceb29c14 (link)
#126103 Improve Docs for hir::Impl and hir::ImplItem a4c9701dafa52bff5094e62cd51bbfb2de976fe1 (link)

previous master: b74702fbb2

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

@workingjubilee workingjubilee deleted the rollup-g7m92b6 branch June 7, 2024 09:28
This was referenced Jun 7, 2024
Open
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (468310e): comparison URL.

Overall result: ❌ regressions - 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.2% [0.2%, 0.3%] 5
Regressions ❌
(secondary)		 0.9% [0.5%, 1.5%] 15
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.2% [0.2%, 0.3%] 5

Max RSS (memory usage)

Results (primary 4.2%)

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

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: missing data
Artifact size: 319.39 MiB -> 319.53 MiB (0.04%)

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

Kobzol commented Jun 7, 2024

@rust-timer build 68115da

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (68115da): comparison URL.

Overall result: ❌ regressions - 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.3% [0.2%, 0.3%] 11
Regressions ❌
(secondary)		 0.9% [0.3%, 1.5%] 16
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.3% [0.2%, 0.3%] 11

Max RSS (memory usage)

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

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: missing data
Artifact size: 319.39 MiB -> 319.64 MiB (0.08%)

@Kobzol
Copy link
Contributor

Kobzol commented Jun 11, 2024

Caused by #125724. Since that is a required refactoring for the new trait solver, there's probably not much we can do about that. Marking as triaged.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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-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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.