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.

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

Rollup of 6 pull requests #126396

Merged
merged 13 commits into from
Jun 13, 2024
Merged

Rollup of 6 pull requests #126396

merged 13 commits into from
Jun 13, 2024

Conversation

fmease
Copy link
Member

@fmease fmease commented Jun 13, 2024

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kobzol and others added 13 commits June 12, 2024 20:52
We implement the trait only for definitions that should have a type.
It's possible that I missed a few definitions, but we can add them later
if needed.
Simplify `try_*`'s signature on `Iterator`

Inspired by rust-lang#126249 (comment).

r? `@scottmcm`

(Seems there's no need to explicitly use `<Self as Iterator>::Item`? I only find this occurrence across the whole file.)
…arsan68

Improve error message if dependency installation in tidy fails

Should help with easier debugging of issues occuring during [venv installation](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/PR.20CI.20broken) of `tidy` dependencies.
Add a new trait to retrieve StableMir definition Ty

We implement the trait only for definitions that should have a type. It's possible that I missed a few definitions, but we can add them later if needed.

Fixes rust-lang/project-stable-mir#80
compiletest: Stricter parsing of `//@ normalize-*` headers

I noticed some problems with the existing parser for these headers:

- It is extremely lax, and basically ignores everything other than the text between two pairs of double-quote characters.
  - Unlike other name-value headers, it doesn't even check for a colon after the header name, so the test suite contains a mixture of with-colon and without-colon normalization rules.
- If parsing fails, the header is silently ignored.

The latter is especially bad for platform-specific normalization rules, because the lack of normalization probably won't be noticed until the test mysteriously fails in one of the full CI jobs.
…ller_location, r=oli-obk

interpret: update doc comment for find_closest_untracked_caller_location

Also add a doc comment to cur_span.

r? `@compiler-errors`
@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 Jun 13, 2024
@fmease
Copy link
Member Author

fmease commented Jun 13, 2024

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 13, 2024

📌 Commit f1a4f30 has been approved by fmease

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

bors commented Jun 13, 2024

⌛ Testing commit f1a4f30 with merge 9fdbfe1...

@bors
Copy link
Contributor

bors commented Jun 13, 2024

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 9fdbfe1 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126347 Simplify try_*'s signature on Iterator b97616c9afefb144fbafbe85d7edc9810f8bf601 (link)
#126348 Improve error message if dependency installation in tidy fa… b30753164ff7a363909b2ee452d5a9aac4f415bb (link)
#126366 Add a new trait to retrieve StableMir definition Ty 30f9973da8f82c4406a3b0939c52bdaa19e15a40 (link)
#126370 compiletest: Stricter parsing of //@ normalize-* headers b533f6c9186d2ff48efc5a223f0267bcf565976e (link)
#126379 interpret: update doc comment for find_closest_untracked_ca… 92d2eb8d2d70280d4b5c85c3c8e3364faf8bc8b0 (link)
#126384 add tracking issue for is_none_or 7711f96fdaa60a687a2bb6f651b29baa7f8b181f (link)

previous master: 921645c737

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 (9fdbfe1): 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)

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

Cycles

Results (primary 3.5%)

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% [0.9%, 7.4%] 13
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.5% [0.9%, 7.4%] 13

Binary size

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

Bootstrap: 671.475s -> 672.787s (0.20%)
Artifact size: 320.37 MiB -> 320.34 MiB (-0.01%)

@fmease fmease deleted the rollup-3j7f6wk branch June 13, 2024 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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. 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.

9 participants