Skip to content
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

Rollup of 5 pull requests #126274

Merged
merged 14 commits into from
Jun 11, 2024
Merged

Rollup of 5 pull requests #126274

merged 14 commits into from
Jun 11, 2024

Conversation

jieyouxu
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Bryanskiy and others added 14 commits June 10, 2024 21:27
…ltiple-emits, r=jieyouxu

Migrate `run-make/multiple-emits` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
…2, r=petrochenkov

Delegation: fix ICE on recursive delegation

fixes rust-lang#124347

r? `@petrochenkov`
…oalbini

Remove ignore-cross-compile directive from ui/macros/proc_macro

All the other proc-macro tests don't have this, presumably this was forgotten when the restriction got lifted as it does test just fine

r? `@pietroalbini`
Do not define opaque types when selecting impls

fixes rust-lang#126117

r? `@lcnr` for inconsistency with next solver
…r=oli-obk

interpret: ensure we check bool/char for validity when they are used in a cast

In general, `Scalar::to_bits` is a bit dangerous as it bypasses all type information. We should usually prefer matching on the type and acting according to that. So I also refactored `unary_op` handling of integers to do that. The remaining `to_bits` uses are operations that just fundamentally don't care about the sign (and only work on integers).

invalid_char_cast.rs is the key new test, the others already passed before this PR.

r? `@oli-obk`
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. rollup A PR which is a rollup labels Jun 11, 2024
@jieyouxu
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 11, 2024

📌 Commit cfd48bd has been approved by jieyouxu

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

bors commented Jun 11, 2024

⌛ Testing commit cfd48bd with merge 0c96061...

@bors
Copy link
Contributor

bors commented Jun 11, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 0c96061 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126186 Migrate run-make/multiple-emits to rmake.rs db2ea961f6a82438092bca8d123fd261473e91e4 (link)
#126236 Delegation: fix ICE on recursive delegation 983615b7b52f9e022e73480ca611876e67796b65 (link)
#126254 Remove ignore-cross-compile directive from ui/macros/proc_m… d9f96d4712270cb34ff142219fbd4175dc7479dd (link)
#126258 Do not define opaque types when selecting impls 9663ab7bcaf04df35f726c29f5758835f44ab37f (link)
#126265 interpret: ensure we check bool/char for validity when they… 86fc1180c8d35558f0ff9070386347273ea48b7c (link)

previous master: 20ba13c38e

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

@jieyouxu jieyouxu deleted the rollup-uj93sfm branch June 11, 2024 15:52
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0c96061): 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 -0.8%)

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)
6.2% [6.2%, 6.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.4% [-4.4%, -4.4%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.8% [-4.4%, 6.2%] 3

Cycles

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

Binary size

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

Bootstrap: 677.565s -> 679.328s (0.26%)
Artifact size: 319.41 MiB -> 320.10 MiB (0.22%)

# 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 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants