Skip to content

Rollup of 12 pull requests #140690

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 44 commits into from
Closed

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented May 6, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joboet and others added 30 commits April 28, 2025 11:13
Move the public `CommandEnvs` into the `process` module (and make it a wrapper type for an internal iterator type) and everything else into `sys::process` as per rust-lang#117276.
This fixes issues with RustAnalyzer not finding stable_mir crate.
It is also part of the long term architecture plan for these crates,
since we are moving towards having stable_mir depend on rustc_smir and
not the other way around.

I believe this is an utility function that will come handy eventually
for stable_mir users, but I'm keeping it as part of rustc_internal since
it initializes the StableMir context and requires `TyCtxt`.

Finally, I added the rustc_internal crate under a feature since the APIs
from this module shall not be stabilized.
Co-authored-by: Jubilee <workingjubilee@gmail.com>
This is a routine update to pull in some fixes and updates.

Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0449
This also causes the coverage-dump unit tests to run in CI and `./x test` by
default.
Zalathar added 7 commits May 6, 2025 12:06
std: get rid of `sys_common::process`

Move the public `CommandEnvs` into the `process` module (and make it a wrapper type for an internal iterator type) and everything else into `sys::process` as per rust-lang#117276.

Something went wrong with a force push, so I can't reopen rust-lang#139020. This is unchanged from that PR, apart from a rebase.

r? ``@thomcc``
Fix RustAnalyzer discovery of rustc's `stable_mir` crate

This fixes issues with RustAnalyzer not finding `stable_mir` crate since RA discovery traverses the dependency graph of `rustc_driver` crate.

This change also aligns with the long term architecture plan for these crates, since we are moving towards having stable_mir depend on rustc_smir and not the other way around. See [this doc](https://hackmd.io/jBRkZLqAQL2EVgwIIeNMHg) for more details.

I believe a similar function will come handy eventually for `stable_mir` users, but I'm keeping it as part of `rustc_internal` since its current format initializes the StableMir context and requires `TyCtxt`.

Finally, I added the `rustc_internal` module re-export under a feature since the APIs from this module shall not be stabilized.
…bilee

Steer docs to `utf8_chunks` and `Iterator::take`

- Adds `limit` as an alias of `take` (as this is [what Java calls this operation](https://docs.oracle.com/javase/8/docs/api/java/util/stream/Stream.html#limit-long-));
- Says that [`Utf8Chunks`](https://doc.rust-lang.org/std/str/struct.Utf8Chunks.html) comes from [`[u8]::utf8_chunks`](https://doc.rust-lang.org/std/primitive.slice.html#method.utf8_chunks).

`@rustbot` label +A-docs
…jubilee

Use more accurate ELF flags on MIPS

Changes the MIPS ELF flags used for metadata objects to be closer to what LLVM uses so the linker doesn't complain
…, r=notriddle

Clean rustdoc tests folder

We were starting to have way too many tests in the `tests/rustdoc/` folder so I moved some of them in sub-folders. We now have less than 300 tests at the "top level" so I guess it's good enough for now.

So this PR just moves tests in sub-folders and that's pretty much it. 😃

r? `@notriddle`
…in-upvar, r=lcnr

Be a bit more relaxed about not yet constrained infer vars in closure upvar analysis

See the writeup in `tests/ui/closures/opaque-upvar.rs`.

TL;DR is that this has to do with the fact that the recursive revealing uses, which have not yet been constrained from the defining use by the time that closure upvar inference is performed, remain as infer vars during upvar analysis. We don't really care, though, since anywhere we structurally match on a type in upvar analysis, we already call `structurally_resolve_type` right before `.kind()`, which would emit a true ambiguity error.

Fixes rust-lang/trait-system-refactor-initiative#197

r? lcnr
Update mdbook to 0.4.49

This is a routine update to pull in some fixes and updates.

Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0449
@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. 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. rollup A PR which is a rollup labels May 6, 2025
@Zalathar
Copy link
Contributor Author

Zalathar commented May 6, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 6, 2025

📌 Commit 1e27a12 has been approved by Zalathar

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 May 6, 2025
@bors
Copy link
Collaborator

bors commented May 6, 2025

⌛ Testing commit 1e27a12 with merge d47fac7...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2025
Rollup of 12 pull requests

Successful merges:

 - rust-lang#139550 (Fix `-Zremap-path-scope` rmeta handling)
 - rust-lang#139773 (Implement `Iterator::last` for `vec::IntoIter`)
 - rust-lang#140035 (Implement RFC 3503: frontmatters)
 - rust-lang#140176 (Fix linking statics on Arm64EC)
 - rust-lang#140251 (coverage-dump: Resolve global file IDs to filenames)
 - rust-lang#140393 (std: get rid of `sys_common::process`)
 - rust-lang#140532 (Fix RustAnalyzer discovery of rustc's `stable_mir` crate)
 - rust-lang#140598 (Steer docs to `utf8_chunks` and `Iterator::take`)
 - rust-lang#140634 (Use more accurate ELF flags on MIPS)
 - rust-lang#140673 (Clean rustdoc tests folder)
 - rust-lang#140678 (Be a bit more relaxed about not yet constrained infer vars in closure upvar analysis)
 - rust-lang#140687 (Update mdbook to 0.4.49)

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

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] shlex test:false 0.263
   Compiling cc v1.2.16
error: linking with `i686-w64-mingw32-gcc` failed: exit code: 1
  |
  = note: "i686-w64-mingw32-gcc" "-fno-use-linker-plugin" "-Wl,--dynamicbase" "-Wl,--disable-auto-image-base" "-Wl,--large-address-aware" "<sysroot>\\lib\\rustlib\\i686-pc-windows-gnu\\lib\\rsbegin.o" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcx8ZAha\\symbols.o" "<2 object files omitted>" "-Wl,-Bstatic" "<sysroot>\\lib\\rustlib\\i686-pc-windows-gnu\\lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libwindows_targets-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,libcfg_if-*,liblibc-*,liballoc-*,librustc_std_workspace_core-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lkernel32" "-lkernel32" "-lntdll" "-luserenv" "-lws2_32" "-ldbghelp" "-lgcc_eh" "-l:libpthread.a" "-lmsvcrt" "-lmingwex" "-lmingw32" "-lgcc" "-lmsvcrt" "-lmingwex" "-luser32" "-lkernel32" "-Wl,--nxcompat" "-o" "<sysroot>-rustc\\release\\build\\proc-macro2-577a658d4e9487fd\\build_script_build-577a658d4e9487fd.exe" "-Wl,--gc-sections" "-no-pie" "-nodefaultlibs" "<sysroot>\\lib\\rustlib\\i686-pc-windows-gnu\\lib\\rsend.o"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: D:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: D:\a\rust\rust\build\i686-pc-windows-gnu\stage1\lib\rustlib\i686-pc-windows-gnu\lib\libstd-5490b0138804bebe.rlib(std-5490b0138804bebe.std.81931ea952d5bae2-cgu.0.rcgu.o):/rustc/d47fac7a76f859163bf622bdd2b73dbaa8378307/library\core\src\ptr/mod.rs:1823:(.text+0x15a6): undefined reference to `_imp____rust_no_alloc_shim_is_unstable'␍
          D:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: D:\a\rust\rust\build\i686-pc-windows-gnu\stage1\lib\rustlib\i686-pc-windows-gnu\lib\libstd-5490b0138804bebe.rlib(std-5490b0138804bebe.std.81931ea952d5bae2-cgu.0.rcgu.o):/rustc/d47fac7a76f859163bf622bdd2b73dbaa8378307/library\core\src\ptr/mod.rs:1823:(.text+0x16f6): undefined reference to `_imp____rust_no_alloc_shim_is_unstable'␍
          D:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: D:\a\rust\rust\build\i686-pc-windows-gnu\stage1\lib\rustlib\i686-pc-windows-gnu\lib\libstd-5490b0138804bebe.rlib(std-5490b0138804bebe.std.81931ea952d5bae2-cgu.0.rcgu.o):/rustc/d47fac7a76f859163bf622bdd2b73dbaa8378307/library\core\src\ptr/mod.rs:1823:(.text+0x1bf8): undefined reference to `_imp____rust_no_alloc_shim_is_unstable'␍
          D:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: D:\a\rust\rust\build\i686-pc-windows-gnu\stage1\lib\rustlib\i686-pc-windows-gnu\lib\libstd-5490b0138804bebe.rlib(std-5490b0138804bebe.std.81931ea952d5bae2-cgu.0.rcgu.o):/rustc/d47fac7a76f859163bf622bdd2b73dbaa8378307/library\core\src\ptr/mod.rs:1823:(.text+0x1ccc): undefined reference to `_imp____rust_no_alloc_shim_is_unstable'␍
          D:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: D:\a\rust\rust\build\i686-pc-windows-gnu\stage1\lib\rustlib\i686-pc-windows-gnu\lib\libstd-5490b0138804bebe.rlib(std-5490b0138804bebe.std.81931ea952d5bae2-cgu.0.rcgu.o):/rustc/d47fac7a76f859163bf622bdd2b73dbaa8378307/library\core\src\ptr/mod.rs:1823:(.text+0x434a): undefined reference to `_imp____rust_no_alloc_shim_is_unstable'␍
          D:/a/rust/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/14.1.0/../../../../i686-w64-mingw32/bin/ld.exe: D:\a\rust\rust\build\i686-pc-windows-gnu\stage1\lib\rustlib\i686-pc-windows-gnu\lib\libstd-5490b0138804bebe.rlib(std-5490b0138804bebe.std.81931ea952d5bae2-cgu.0.rcgu.o):/rustc/d47fac7a76f859163bf622bdd2b73dbaa8378307/library\core\src\ptr/mod.rs:1823: more undefined references to `_imp____rust_no_alloc_shim_is_unstable' follow␍
          collect2.exe: error: ld returned 1 exit status
          
  = note: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
  = note: use the `-l` flag to specify native libraries to link
  = note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-link-lib)

@bors
Copy link
Collaborator

bors commented May 6, 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 May 6, 2025
@Zalathar
Copy link
Contributor Author

Zalathar commented May 6, 2025

The failure is probably #140176, but if so then that PR is about to fail on its own in a few minutes anyway, so we might as well wait for that confirmation.

@Zalathar Zalathar closed this May 6, 2025
@Zalathar Zalathar deleted the rollup-f8sxwp1 branch May 6, 2025 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.