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 3 pull requests #121964

Merged
merged 7 commits into from
Mar 4, 2024
Merged

Rollup of 3 pull requests #121964

merged 7 commits into from
Mar 4, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

chenyukang and others added 7 commits February 29, 2024 19:01
@chenyukang
Suggest moving if non-found macro_rules! is defined later
97feb71
@chenyukang
rename testcase
08fa734
@fmease
Properly deal with GATs when looking for method chains to point at
6035e87
@Zoxc
Add a proper with_no_queries to printing
6fb4ac6
@matthiaskrgr
Rollup merge of rust-lang#121130 - chenyukang:yukang-fix-121061-macro…
c620ae5 
…-later, r=matthiaskrgr

Suggest moving definition if non-found macro_rules! is defined later

Fixes rust-lang#121061
@matthiaskrgr
Rollup merge of rust-lang#121912 - fmease:diag-method-chains-gat, r=c…
cd9e5b5 
…ompiler-errors,estebank

Properly deal with GATs when looking for method chains to point at

Fixes rust-lang#121898.

~~While it prevents an ICE and the structured suggestion is correct, the method chain diagnostic notes are weird / useless / incorrect judging by a quick look. I guess I should improve that in this PR.~~ Sufficiently taken care of.

r? estebank or compiler-errors (rust-lang#105332, rust-lang#105674).
@matthiaskrgr
Rollup merge of rust-lang#121927 - Zoxc:print-no-query, r=estebank
de95c39 
Add a proper `with_no_queries` to printing
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. rollup A PR which is a rollup labels Mar 4, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Mar 4, 2024

📌 Commit de95c39 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 4, 2024
@bors
Copy link
Contributor

bors commented Mar 4, 2024

⌛ Testing commit de95c39 with merge 7606c13...

@bors
Copy link
Contributor

bors commented Mar 4, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 7606c13 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 4, 2024
@bors bors merged commit 7606c13 into rust-lang:master Mar 4, 2024
12 checks passed
@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
#121130 Suggest moving definition if non-found macro_rules! is defi… 283d7415f8da7cdb36ca52ed570f8716b2029d1b (link)
#121912 Properly deal with GATs when looking for method chains to p… f9f6709da24cca4fef8e7d779f73bdad721c0609 (link)
#121927 Add a proper with_no_queries to printing 45a5d2bf3fe658362acc8e914c2174b358de04d5 (link)

previous master: f7cb53e54b

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 (7606c13): 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

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

Binary size

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

Bootstrap: 643.541s -> 645.218s (0.26%)
Artifact size: 175.00 MiB -> 175.01 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-rtcju5m branch March 16, 2024 18:19
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
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. 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.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @bors @rust-timer @rustbot @chenyukang @fmease @Zoxc