rust-lang / rust

Empowering everyone to build reliable and efficient software.
https://www.rust-lang.org
Other
99.01k stars 12.79k forks source link

Rollup of 28 pull requests #133490

Closed jhpratt closed 3 days ago

jhpratt commented 3 days ago

Successful merges:

r? @ghost @rustbot modify labels: rollup

Create a similar rollup

jhpratt commented 3 days ago

@bors r+ rollup=never p=28

bors commented 3 days ago

:pushpin: Commit 478a4fb98698b903afb23fb2301c0c90705cd58b has been approved by jhpratt

It is now in the queue for this repository.

bors commented 3 days ago

:hourglass: Testing commit 478a4fb98698b903afb23fb2301c0c90705cd58b with merge 33c3a5e73ad04a7478ee93026719c2ed2649b76f...

BoxyUwU commented 3 days ago

@bors retry

yielding to a last minute stable branch backport as there is only a couple days before release

bors commented 3 days ago

:hourglass: Testing commit 478a4fb98698b903afb23fb2301c0c90705cd58b with merge 199955ebea599e91c0f7ea8da003cd064bd44b50...

BoxyUwU commented 3 days ago

oh right p=28 is more than 20 lol... @bors retry

jhpratt commented 3 days ago

I had just checked the queue and was about to decrease this to 10. Minor detail, all in all...definitely prioritize the backport.

lqd commented 3 days ago

Please correct me if I'm wrong but isn't this why rollups are defined to be at p=5 https://forge.rust-lang.org/release/rollups.html#making-a-rollup so that high-prio PRs needing to land can set p>5 and be sure to be in front of existing rollups and of rollups that would be created after the high-priority PR?

bors commented 3 days ago

:hourglass: Testing commit 478a4fb98698b903afb23fb2301c0c90705cd58b with merge 6ce8a37fce366e8537f403ad5e3b2e031f5af5d4...

rust-log-analyzer commented 3 days ago

The job dist-various-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) ```plain error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/process.rs:586:30 | 586 | .map_err(|_| const_error!(io::ErrorKind::Other, "utf8 conversion failed")) | help: consider importing this macro through its public re-export | 306 + use crate::io::const_error; 306 + use crate::io::const_error; | error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/process.rs:372:32 | 372 | .ok_or_else(|| const_error!(io::ErrorKind::NotFound, "Boot Services not found"))? | help: consider importing this macro through its public re-export | 306 + use crate::io::const_error; 306 + use crate::io::const_error; | error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/process.rs:331:32 | 331 | .ok_or_else(|| const_error!(io::ErrorKind::NotFound, "Boot Services not found"))? | help: consider importing this macro through its public re-export | 306 + use crate::io::const_error; --- error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/helpers.rs:246:32 | 246 | .ok_or_else(|| const_error!(io::ErrorKind::InvalidFilename, "Invalid Device Path")) | help: consider importing this macro through its public re-export | 12 + use crate::io::const_error; --- error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/helpers.rs:137:35 | 137 | NonNull::new(event).ok_or(const_error!(io::ErrorKind::Other, "null protocol")) | help: consider importing this macro through its public re-export | 12 + use crate::io::const_error; 12 + use crate::io::const_error; | error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/helpers.rs:117:20 | 117 | .ok_or(const_error!(io::ErrorKind::Other, "null protocol")) | help: consider importing this macro through its public re-export | 12 + use crate::io::const_error; 12 + use crate::io::const_error; | error: cannot find macro `const_error` in this scope --> std/src/sys/pal/uefi/helpers.rs:33:5 | 33 | const_error!(io::ErrorKind::Other, "Boot Services are no longer available"); | help: consider importing this macro through its public re-export | 12 + use crate::io::const_error; ```
bors commented 3 days ago

:broken_heart: Test failed - checks-actions

compiler-errors commented 3 days ago

rollups this size are way too large and better broken into several rollups that can merge one after the other (or begin testing immediately after one fails). the chances of a 30 PR large rollup merging even if it contains all rollup=always PRs is pretty slim lol

jhpratt commented 2 days ago

@lqd Looks like it should have been, my mistake. I've always seen it as the number of PRs included.

@compiler-errors Fair point! I saw the queue was nearly 50 PRs accepted and didn't consider splitting it into multiple rollups.

BoxyUwU commented 2 days ago

I think generally people don't really follow that forge reccomendation because i see p=12 p=9 whatever rollups all the time