Skip to content

Rollup of 6 pull requests #129162

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
Aug 16, 2024
Merged

Rollup of 6 pull requests #129162

merged 14 commits into from
Aug 16, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

slanterns and others added 14 commits August 14, 2024 18:28
…r=compiler-errors

Re-enable more debuginfo tests on freebsd

These ignores are _ancient_, we don't run freebsd tests in CI, and even if we did they'd probably pass because the test suite passes with the latest gdb release on Linux.
Special-case alias ty during the delayed bug emission in `try_from_lit`

This PR tries to fix rust-lang#116308.

A delayed bug in `try_from_lit` will not be emitted so that the compiler will not ICE when it sees the pair `(ast::LitKind::Int, ty::TyKind::Alias)` in `lit_to_const` (called from `try_from_lit`).

This PR is related to an unstable feature `adt_const_params` (rust-lang#95174).

r? ``@BoxyUwU``
Stabilize `is_none_or`

Closes: rust-lang#126383.

`@rustbot` label: +T-libs-api

r? libs-api
…pt, r=jieyouxu

Migrate `validate_json.py` script to rust in `run-make/rustdoc-map-file` test

This PR fixes the FIXME I added for future-me who become present-me. :')

Since there are multiple `run-make` tests using python scripts, I suppose more of them will migrate to Rust, hence why I added the `jzon` public reexport to the `run-make-support` crate.

cc `@jieyouxu`
r? `@Kobzol`
Fix wrong source location for some incorrect macro definitions

Fixes rust-lang#95463

Currently the code will consume the next token tree after `var` when trying to parse `$var:some_type` even when it's not a `:` (e.g. a `$` when input is `($foo $bar:tt) => {}`). Additionally it will return the wrong span when it's not a `:`.

This PR fixes these problems.
Stabilize std::thread::Builder::spawn_unchecked

Closes rust-lang#55132.
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. rollup A PR which is a rollup labels Aug 16, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Aug 16, 2024

📌 Commit a9bf86a 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 Aug 16, 2024
@bors
Copy link
Collaborator

bors commented Aug 16, 2024

⌛ Testing commit a9bf86a with merge 506052d...

@bors
Copy link
Collaborator

bors commented Aug 16, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 506052d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 16, 2024
@bors bors merged commit 506052d into rust-lang:master Aug 16, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 16, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#128990 Re-enable more debuginfo tests on freebsd 5b27f5e2fb3eca9850af5f618a63a666a592e72c (link)
#129042 Special-case alias ty during the delayed bug emission in `t… 4d0b2c9d7ed881c55d62af2dd5da72a6fbaf677d (link)
#129086 Stabilize is_none_or 2e5df4eacbe6ff8ded18e8adcf56e6bf905489c8 (link)
#129149 Migrate validate_json.py script to rust in `run-make/rust… 02ead11955f243d311ad4e91ccc2000dd1c30079 (link)
#129154 Fix wrong source location for some incorrect macro definiti… 4745eb055bc727b6e7c0d347e54a8ab1ee1f6c93 (link)
#129161 Stabilize std::thread::Builder::spawn_unchecked e6aa8aee96a4227a13523b864670d7306e9da940 (link)

previous master: 569d7e3d15

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 (506052d): 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 -1.5%, secondary -3.7%)

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)
-1.5% [-1.5%, -1.5%] 1
Improvements ✅
(secondary)
-3.7% [-4.2%, -3.1%] 2
All ❌✅ (primary) -1.5% [-1.5%, -1.5%] 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: 750.018s -> 750.072s (0.01%)
Artifact size: 339.17 MiB -> 339.23 MiB (0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-r0oxdev branch September 1, 2024 17:36
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs 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. 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.

10 participants