Skip to content

Rollup of 7 pull requests #140355

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

Closed
wants to merge 20 commits into from
Closed

Conversation

tgross35
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

clarfonthey and others added 20 commits February 22, 2025 14:59
- Bump up the version to 5.2.0

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
Stabilise `std::ffi::c_str`

This finished FCP in rust-lang#112134 but never actually got a stabilisation PR. Since the FCP in rust-lang#120048 recently passed to add the `os_str` module, it would be nice to also merge this too, to ensure that both get added in the next version.

Note: The added stability attributes which *somehow* were able to be omitted before (rustc bug?) were added based on the fact that they were added in 3025513, which ended up in 1.85.0.

Closes: rust-lang#112134

r? libs-api
uefi: Update r-efi

- Bump up the version to 5.2.0
…BoxyUwU

check types of const param defaults

fixes rust-lang#139643 by checking that the type of a const parameter default matches the type of the parameter as long as both types are fully concrete

r? `@BoxyUwU`
…ng, r=fmease

Fix detection of main function if there are expressions around it

Fixes rust-lang#140162.
Fixes rust-lang#139651.

Once this is merged, we can backport and I'll send a follow-up to emit a warning in case a `main` function is about to be "wrapped" (and therefore not run).

r? ``@fmease``

try-job: x86_64-gnu-aux
…, r=notriddle

Correctly display stdout and stderr in case a doctest is failing

Fixes rust-lang#140289.

Since the doctest is actually running itself, we need to handle the output directly inside it.

cc ``@fmease``
r? ``@notriddle``
Update example to use CStr::to_string_lossy
Clarified bootstrap optimization "true" argument

fixes rust-lang#140328
@rustbot rustbot added 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 27, 2025
@tgross35
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 27, 2025

📌 Commit 64bb69a has been approved by tgross35

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 Apr 27, 2025
@bors
Copy link
Collaborator

bors commented Apr 27, 2025

⌛ Testing commit 64bb69a with merge 39658ed...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2025
Rollup of 7 pull requests

Successful merges:

 - rust-lang#137439 (Stabilise `std::ffi::c_str`)
 - rust-lang#138737 (uefi: Update r-efi)
 - rust-lang#139646 (check types of const param defaults)
 - rust-lang#140220 (Fix detection of main function if there are expressions around it)
 - rust-lang#140291 (Correctly display stdout and stderr in case a doctest is failing)
 - rust-lang#140297 (Update example to use CStr::to_string_lossy)
 - rust-lang#140330 (Clarified bootstrap optimization "true" argument)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-distcheck failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
fmt check
fmt: checked 5998 files
tidy check

thread 'deps (.)' panicked at src/tools/tidy/src/deps.rs:591:24:
cmd.exec() failed with `cargo metadata` exited with an error: error: failed to select a version for the requirement `r-efi = "^4.1.0"` (locked to 4.5.0)
candidate versions found which didn't match: 5.2.0
location searched: directory source `/checkout/obj/build/tmp/distcheck/vendor` (which is replacing registry `crates-io`)
required by package `uefi_qemu_test v0.0.0 (/checkout/src/ci/docker/host-x86_64/test-various/uefi_qemu_test)`
perhaps a crate was updated and forgotten to be re-vendored?

note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

thread 'main' panicked at src/tools/tidy/src/main.rs:61:49:
called `Result::unwrap()` on an `Err` value: Any { .. }
Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:01:11
make: *** [Makefile:49: check] Error 1
Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:07:11
  local time: Sun Apr 27 01:57:44 UTC 2025
  network time: Sun, 27 Apr 2025 01:57:44 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Apr 27, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 27, 2025
@tgross35 tgross35 mentioned this pull request Apr 27, 2025
@tgross35 tgross35 closed this Apr 27, 2025
@tgross35 tgross35 deleted the rollup-sean6my branch April 27, 2025 02:05
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup 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. T-rustdoc Relevant to the rustdoc 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