Skip to content

Rollup of 7 pull requests - #131827

Merged
bors merged 22 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-umncb57
Oct 17, 2024
Merged

Rollup of 7 pull requests#131827
bors merged 22 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-umncb57

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Oct 17, 2024

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cafce25and others added 22 commits July 30, 2024 14:55
@cafce25
Change orphan hint from "only" to "any uncovered type inside..."
9ce811c
@cafce25
Adjust orphan note in tests
86a9959
@cafce25
Add more information link to orphan impls
ca94dd5
@cafce25
Make new information notes instead of labels
b89c620
@heiher
Setting up indirect access to external data for loongarch64-linux-{mu…
b1579e8
…sl,ohos}
In issue rust-lang#118053, the `loongarch64-unknown-linux-gnu` target needs indirection
to access external data, and so do the `loongarch64-unknown-linux-musl` and
`loongarch64-unknown-linux-ohos` targets.
@maurer
llvm: Tolerate propagated range metadata
0e73095
llvm/llvm-project#91101 propagates range information across inlining,
resulting in more metadata in this test. Tolerate the range metadata if
it appears.
@fmease
rustdoc-JSON: Rename "object safe" to "dyn compatible"
2e6f3bd
@workingjubilee
compiler: use is_none_or where it is clearly better
47cfaa6
heuristic was: if it easily allows removing bangs entirely? worth it.
if it requires more effort or just moves the bang? not.
@lcnr
ImpliedOutlivesBounds to rustc_middle
401f9b4
@lcnr
remove type_op constructors
9334d85
@lcnr
DropckOutlives to rustc_middle
f3ce557
@lcnr
remove Canonical::unchecked_rebind, it's unused
5834ba1
@lcnr
move defining_opaque_types out of Canonical
3360c17
@lcnr
bless mir-opt tests
6cf4cb8
@lcnr
extract expr_assign_expected_bool_error
02982f2
@matthiaskrgr
Rollup merge ofrust-lang#128391- cafce25:issue-128390, r=lcnr
21c57f5
Change orphan hint from "only" to "any uncovered type inside..."
Fixrust-lang#128390
@matthiaskrgr
Rollup merge ofrust-lang#131583- heiher:loong-issue-118053, r=jieyouxu
9aee5d9
Setting up indirect access to external data for loongarch64-linux-{musl,ohos}
In issue rust-lang#118053, the `loongarch64-unknown-linux-gnu` target needs indirection to access external data, and so do the `loongarch64-unknown-linux-musl` and `loongarch64-unknown-linux-ohos` targets.
@matthiaskrgr
Rollup merge ofrust-lang#131595- fmease:rustdoc-json-mv-obj-safe-dy…
f6b699c
…n-compat, r=aDotInTheVoid
rustdoc-JSON: Rename "object safe" to "dyn compatible"
~~Blocked: Sits atop rust-lang#131594. Only the last commit is relevant.~~ (rebased)
Part of rust-lang#130852.
r? aDotInTheVoid or rustdoc
@matthiaskrgr
Rollup merge ofrust-lang#131748- lcnr:typing-mode, r=compiler-errors
c1f3702
cleanup canonical queries
best reviewed commit by commit. adding `CanonicalQueryInput` to stop returning `defining_opaque_types` in query responses is the most involved change here.
r? ``@compiler-errors``
@matthiaskrgr
Rollup merge ofrust-lang#131798- maurer:range-inlining, r=durin42
7ad2f60
llvm: Tolerate propagated range metadata
llvm/llvm-project#91101 propagates range information across inlining, resulting in more metadata in this test. Tolerate the range metadata if it appears.
``@rustbot:`` label +llvm-main
r? ``@durin42``
Please wait a moment before approving, putting the llvm-main tag on it to make sure it fixes the integration test.
@matthiaskrgr
Rollup merge ofrust-lang#131815- workingjubilee:did-you-mean-is-non…
887afd1
…e-or, r=jieyouxu
compiler: use `is_none_or` where it is clearly better
heuristic was: if it easily allows removing bangs entirely? worth it. if it requires more effort or just moves the bang? not.
@matthiaskrgr
Rollup merge ofrust-lang#131822- lcnr:typeck-error-reporting, r=jie…
c735655
…youxu
extract `expr_assign_expected_bool_error`
moving diagnostics code out of the happy path makes it a lot easier to read imo
@rustbotrustbot added A-rustdoc-json Area: Rustdoc JSON backend 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Oct 17, 2024
@matthiaskrgr

matthiaskrgr commented Oct 17, 2024

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=7

@bors

bors commented Oct 17, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit c735655 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Oct 17, 2024
@bors

bors commented Oct 17, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c735655 with merge 03983fb...

@bors

bors commented Oct 17, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 03983fb to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 17, 2024
@bors
bors merged commit 03983fb into rust-lang:masterOct 17, 2024
@rustbotrustbot added this to the 1.84.0 milestone Oct 17, 2024
@rust-timer

rust-timer commented Oct 17, 2024

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#128391Change orphan hint from "only" to "any uncovered type insid…6741b73c4546f006eb65c6ed587d2f71094a492a (link)
#131583Setting up indirect access to external data for loongarch64…7e77388fa9c734a0ab6b66bd267c17d743ebdca6 (link)
#131595rustdoc-JSON: Rename "object safe" to "dyn compatible"71bd0b7c06b509b8ddc29c568dda472e1046f599 (link)
#131748cleanup canonical queries07e00c4922f6a23acd820b1422d623889cc86e70 (link)
#131798llvm: Tolerate propagated range metadata85de4d93fc8a7bf6e9d1c4b6d101856106f7fe77 (link)
#131815compiler: use is_none_or where it is clearly better7b245461fccef99f468e21da4d8c7e531bd60f0c (link)
#131822extract expr_assign_expected_bool_errorbe27d53318b0512fd998b79695382903cbf01ffd (link)

previous master: 06d261daf6

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

rust-timer commented Oct 17, 2024

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (03983fb): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -2.9%, secondary -0.6%)

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.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.1%[2.1%, 2.1%]2
Improvements ✅
(primary)		-2.9%[-3.8%, -1.1%]3
Improvements ✅
(secondary)		-3.3%[-5.0%, -1.6%]2
All ❌✅ (primary)-2.9%[-3.8%, -1.1%]3

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: 780.529s -> 781.303s (0.10%)
Artifact size: 333.89 MiB -> 333.79 MiB (-0.03%)

@matthiaskrgr
matthiaskrgr deleted the rollup-umncb57 branch January 25, 2025 09:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-rustdoc-jsonArea: Rustdoc JSON backendmerged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.84.0

Development

Successfully merging this pull request may close these issues.

10 participants

@matthiaskrgr@bors@rust-timer@rustbot@cafce25@heiher@maurer@fmease@workingjubilee@lcnr