Skip to content

Rollup of 16 pull requests #145280

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

Closed
wants to merge 60 commits into from
Closed

Conversation

fmease
Copy link
Member

@fmease fmease commented Aug 11, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Gelbpunkt and others added 30 commits July 26, 2025 22:34
Currently, when setting the thread stack size fails, it would be rounded
up to the nearest multiple of the page size and the code asserts that
the next call to pthread_attr_setstacksize succeeds.

This may be true for glibc, but it isn't true for musl, which not only
enforces a minimum stack size, but also a maximum stack size of
usize::MAX / 4 - PTHREAD_STACK_MIN [1], triggering the assert rather
than erroring gracefully.

There isn't any way to handle this properly other than bailing out and
letting the user know it didn't succeed.

[1]: https://git.musl-libc.org/cgit/musl/tree/src/thread/pthread_attr_setstacksize.c#n5

Signed-off-by: Jens Reidel <[email protected]>
_span could possibly be confused with the Span type in rustc
Use a time representation with 1900-01-01-00:00:00 at timezone -1440 min as
anchor. This is the earliest time supported in UEFI.

Signed-off-by: Ayush Singh <[email protected]>
Add tests to ensure that extream system times are still representable.

Signed-off-by: Ayush Singh <[email protected]>
…medValueStr`

Modify `AttributeTemplate` to support list of alternatives for list and name value attribute styles.

Suggestions now provide more correct suggested code:

```
error[E0805]: malformed `used` attribute input
  --> $DIR/used_with_multi_args.rs:3:1
   |
LL | #[used(compiler, linker)]
   | ^^^^^^------------------^
   |       |
   |       expected a single argument here
   |
help: try changing it to one of the following valid forms of the attribute
   |
LL - #[used(compiler, linker)]
LL + #[used(compiler)]
   |
LL - #[used(compiler, linker)]
LL + #[used(linker)]
   |
LL - #[used(compiler, linker)]
LL + #[used]
   |
```

instead of the prior "masking" of the lack of this feature by suggesting pipe-separated lists:

```
error[E0805]: malformed `used` attribute input
  --> $DIR/used_with_multi_args.rs:3:1
   |
LL | #[used(compiler, linker)]
   | ^^^^^^------------------^
   |       |
   |       expected a single argument here
   |
help: try changing it to one of the following valid forms of the attribute
   |
LL - #[used(compiler, linker)]
LL + #[used(compiler|linker)]
   |
LL - #[used(compiler, linker)]
LL + #[used]
   |
```
This commit amends the documentation of `Vec::as_mut_ptr` and
`Vec::into_raw_parts` to make it explicit that such calls may be paired
with calls to `dealloc` with a suitable layout. This guarantee was
effectively already provided by the docs of `Vec::from_raw_parts`
mentioning `alloc`.

Additionally, we copy-paste and adjust the “Memory layout” section from
the documentation of `std::boxed` to `std::vec`. This explains the allocator
guarantees in more detail.
 - remove some stabilized target features from `gate.rs`
@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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Aug 11, 2025
@fmease
Copy link
Member Author

fmease commented Aug 11, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Aug 11, 2025

📌 Commit 590eae8 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 Aug 11, 2025
@fmease
Copy link
Member Author

fmease commented Aug 11, 2025

While we're waiting, let's run a basic try-job.

@bors try

@rust-bors
Copy link

rust-bors bot commented Aug 11, 2025

⌛ Trying commit 590eae8 with merge 9d1719a

To cancel the try build, run the command @bors try cancel.

rust-bors bot added a commit that referenced this pull request Aug 11, 2025
@clarfonthey
Copy link
Contributor

Note: I tried to get bors to remove #144519 from the queue but it wouldn't let me. #139806 and my PR almost certainly conflict, and I'm fine deferring my PR until after.

@rust-log-analyzer
Copy link
Collaborator

The job tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 \
  src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
#    pip-compile --allow-unsafe --generate-hashes reuse-requirements.in
---
#15 3.339 Building wheels for collected packages: reuse
#15 3.340   Building wheel for reuse (pyproject.toml): started
#15 3.561   Building wheel for reuse (pyproject.toml): finished with status 'done'
#15 3.562   Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132719 sha256=d2a2565e7037ad3883fb9337653f2e25bbb588534fbef3697286cbc26d1bf634
#15 3.562   Stored in directory: /tmp/pip-ephem-wheel-cache-6xq018f6/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532
#15 3.564 Successfully built reuse
#15 3.565 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs
#15 3.980 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0
#15 3.980 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#15 4.539 Collecting virtualenv
---
DirectMap4k:      145344 kB
DirectMap2M:     4048896 kB
DirectMap1G:    14680064 kB
##[endgroup]
Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0   src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck
+ TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.05s
##[endgroup]
WARN: `rust.debug-assertions = true` will prevent downloading CI rustc as alt CI rustc is not currently built with debug assertions.
downloading https://static.rust-lang.org/dist/2025-08-06/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
---
checking python file formatting
27 files already formatted
checking C++ file formatting
spellcheck files
building external tool typos from package [email protected]
finished building tool typos
error: `moreso` should be `more`
##[error]  --> compiler/rustc_codegen_ssa/src/back/apple.rs:177:43
    |
177 |             // in a manner unknown to us (moreso if cross-compiling):
    |                                           ^^^^^^
    |
error: `modifed` should be `modified`
##[error]  --> library/std/src/sys/pal/uefi/time.rs:178:29
    |
178 |     /// This algorithm is a modifed version of the one described in the post:
    |                             ^^^^^^^
    |
error: `stablized` should be `stabilized`
##[error]  --> library/std/src/sys/pal/uefi/time.rs:187:56
    |
187 |         // FIXME(#126043): use checked_sub_signed once stablized
    |                                                        ^^^^^^^^^
    |
tidy error: checks with external tool 'typos' failed
some tidy checks failed
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/rust-tidy /checkout /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo /checkout/obj/build 4 /node/bin/npm --extra-checks=py,cpp,js,spellcheck` failed with exit code 1
Created at: src/bootstrap/src/core/build_steps/tool.rs:1636:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:1239:29

Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:02:39
  local time: Mon Aug 11 23:59:15 UTC 2025
  network time: Mon, 11 Aug 2025 23:59:15 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@clarfonthey
Copy link
Contributor

Or! The typo checker could make that PR the one that actually needs to be fixed. .-.

@fmease
Copy link
Member Author

fmease commented Aug 12, 2025

@bors try cancel

@rust-bors
Copy link

rust-bors bot commented Aug 12, 2025

Try build cancelled. Cancelled workflows:

@fmease
Copy link
Member Author

fmease commented Aug 12, 2025

Welp, should I kick spellcheck out or "overhaul SystemTime" >.< hmm, I guess I'll kick spellcheck out.

@fmease
Copy link
Member Author

fmease commented Aug 12, 2025

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 12, 2025
@fmease fmease closed this Aug 12, 2025
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 12, 2025
@fmease fmease deleted the rollup-q39klge branch August 12, 2025 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-search Area: Rustdoc's search feature A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) O-unix Operating system: Unix-like rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.