Commit graph

12641 commits

Author SHA1 Message Date
Matthias Krüger
3ab435b705
Rollup merge of #127962 - jieyouxu:cleanup-dll-compiletest, r=fmease
Cleanup compiletest dylib name calculation

Use `std::env::consts::{DLL_PREFIX, DLL_EXTENSION}` for dylib name calculation which is more accurate for the various different platforms, and is more likely to be looked at by target maintainers.

cc ``@bzEq`` (as this impacts how compiletest handles AIX dll extensions)
2024-07-23 13:06:55 +02:00
Matthias Krüger
1b4b0e9a4d
Rollup merge of #125834 - workingjubilee:weaken-thir-unsafeck-for-addr-of-static-mut, r=compiler-errors
treat `&raw (const|mut) UNSAFE_STATIC` implied deref as safe

Fixes rust-lang/rust#125833

As reported in that and related issues, `static mut STATIC_MUT: T` is very often used in embedded code, and is in many ways equivalent to `static STATIC_CELL: SyncUnsafeCell<T>`. The Rust expression of `&raw mut STATIC_MUT` and `SyncUnsafeCell::get(&STATIC_CELL)` are approximately equal, and both evaluate to `*mut T`. The library function is safe because it has *declared itself* to be safe. However, the raw ref operator is unsafe because all uses of `static mut` are considered unsafe, even though the static's value is not used by this expression (unlike, for example, `&STATIC_MUT`).

We can fix this unnatural difference by simply adding the proper exclusion for the safety check inside the THIR unsafeck, so that we do not declare it unsafe if it is not.

While the primary concern here is `static mut`, this change is made for all instances of an "unsafe static", which includes a static declared inside `extern "abi" {}`. Hypothetically, we could go as far as generalizing this to all instances of `&raw (const|mut) *ptr`, but today we do not, as we have not actually considered the range of possible expressions that use a similar encoding. We do not even extend this to thread-local equivalents, because they have less clear semantics.
2024-07-23 13:06:54 +02:00
bors
8ded134198 Auto merge of #127778 - Oneirical:artificial-intestlligence, r=jieyouxu
Migrate `staticlib-blank-lib`, `rlib-format-packed-bundled-libs-3` and `issue-97463-abi-param-passing` `run-make` tests to rmake

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: aarch64-gnu
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-mingw
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
2024-07-23 01:51:57 +00:00
Jubilee Young
b3cd9b5cd3 miri: fixup for allowing &raw UNSAFE_STATIC 2024-07-22 14:54:36 -07:00
bors
cefe1dcef0 Auto merge of #127786 - ehuss:rustbook-workspace, r=Mark-Simulacrum
Move rustbook to its own workspace.

This moves rustbook (the wrapper around mdbook) to its own Cargo workspace. This is done for two reasons:

- Some users want to avoid having to check out documentation submodules if they are not working on documentation. These submodules are required for submodules that have Cargo dependencies in the tree (such as mdbook preprocessors).
- The [pinned `memchr`](eb72697e41/compiler/rustc_ast/Cargo.toml (L10)) is causing problems with updating. That pin is only necessary for the standard library, but unfortunately it is affecting all other crates.

This will have some drawbacks:

- A slight increase in the vendor directory size. My measurement shows about a 14M increase (0.7%), but somehow the compressed filesize is smaller.
- The dependencies for rustbook now need to be managed separately. I have updated the cron job to try to mitigate this.
- There will be a slight dist build time penalty. I'm not sure what it will be, since it heavily depends on the machine, but I suspect in the 30-45s range.
- Adds more complexity to things like bootstrap and tidy.

There are a few other alternatives considered:

- Publish preprocessors on crates.io. This adds the burden of publishing every change, and ensuring those publishes happen and the sources don't get out of sync, and somehow syncing those updates back to rust-lang/rust during the automatic updates. This is also more work.
- Move the submodules to subtrees. These have the added burden of doing updates in a way that is more difficult than submodules. I believe it also causes problems with GitHub's `#NNNN` tagging and closing issues. This is also more work.

The only thing I haven't tested here is the cron job. However, there's a pretty decent chance this won't pass CI, or that I missed something.
2024-07-22 20:12:52 +00:00
bors
2a1c384f0e Auto merge of #128063 - tgross35:rollup-hsxmptf, r=tgross35
Rollup of 9 pull requests

Successful merges:

 - #117932 (Correct rustdoc section where we talk about rustdoc emitting errors on invalid code)
 - #125990 (Rename `deprecated_safe` lint to `deprecated_safe_2024`)
 - #127506 (rustc_target: add known safe s390x target features)
 - #127820 (Rewrite and rename `issue-14698`. `issue-33329` and `issue-107094` `run-make` tests to rmake or ui)
 - #127923 (Use reuse tool 4.0)
 - #128008 (Start using `#[diagnostic::do_not_recommend]` in the standard library)
 - #128036 (add more tests)
 - #128051 (rustdoc: revert spacing change in item-table)
 - #128059 (Add regression test for items list size (#128023))

r? `@ghost`
`@rustbot` modify labels: rollup
2024-07-22 17:45:18 +00:00
Oneirical
55dda5d862 rewrite and rename issue-97463-abi-param-passing to rmake 2024-07-22 13:05:07 -04:00
Trevor Gross
a7e884f50e
Rollup merge of #127923 - ferrocene:use-reuse-tool-4.0, r=pietroalbini
Use reuse tool 4.0

This change upgrades us to reuse-tool 4.0.3, which has a new TOML format configuration instead of the old `.reuse/dep5` Debian-style file.

* Updated requirements file to install reuse-4.0.3
* Ran `reuse convert-dep5` to switch to new file format
* Switched over to `override` so the `REUSE.toml` file takes precedence over whatever random Copyright strings `reuse` finds in the source tree.

Should fix https://github.com/rust-lang/rust/issues/127361
2024-07-22 11:40:21 -05:00
Trevor Gross
3ba92bec0e
Rollup merge of #127820 - Oneirical:intestellar-travel, r=jieyouxu
Rewrite and rename `issue-14698`. `issue-33329` and `issue-107094` `run-make` tests to rmake or ui

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

try-job: armhf-gnu
try-job: test-various
try-job: aarch64-apple
try-job: x86_64-msvc
2024-07-22 11:40:20 -05:00
Trevor Gross
81135a015f
Rollup merge of #125990 - tbu-:pr_unsafe_env_lint_name, r=ehuss
Rename `deprecated_safe` lint to `deprecated_safe_2024`

Create a lint group `deprecated_safe` that includes `deprecated_safe_2024`.

Addresses https://github.com/rust-lang/rust/issues/124866#issuecomment-2142814375.

r? `@ehuss`
2024-07-22 11:40:19 -05:00
bors
20f23abbec Auto merge of #128041 - compiler-errors:uplift-errors-into-trait-sel, r=lcnr
Uplift most type-system related error reporting from `rustc_infer` to `rustc_trait_selection`

Completes the major part of #127492. The only cleanup that's needed afterwards is to actually use normalization in favor of the callback where needed, and deleting `can_eq_shallow`.

r? lcnr

Sorry for the large diff! Would prefer if comments can be handled in a follow-up (unless they're absolutely dealbreakers) because it seems bitrotty to let this sit.
2024-07-22 15:06:18 +00:00
Eric Huss
5dfa062b87 Move rustbook to its own workspace. 2024-07-22 07:20:57 -07:00
Oneirical
8990df7d13 rewrite and rename issue-107094 to rmake 2024-07-22 10:12:00 -04:00
Oneirical
613a7a79e7 rewrite and rename issue-33329 to ui test 2024-07-22 10:11:59 -04:00
Oneirical
e870ab86dc rewrite and rename issue-14698 to rmake 2024-07-22 10:11:47 -04:00
Jonathan Pallant
2e971bf5c6
Removed CondensedDirectory support from license tools.
Now that we have reuse-tool 4.0, we no longer need to massage the JSON license data to collapse LLVM into a single copyright notice and license - reuse-tool can do it for us using an annotation in REUSE.toml.

This effectively reverts c6eb03b.
2024-07-22 10:44:18 +01:00
许杰友 Jieyou Xu (Joe)
5b915ab022
Rollup merge of #127985 - Oneirical:testibule-of-hell, r=Kobzol
Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
2024-07-22 16:44:05 +08:00
许杰友 Jieyou Xu (Joe)
27550f4fa4
Rollup merge of #127510 - tgross35:test-float-parse-update, r=Mark-Simulacrum
Rewrite `test-float-parse` in Rust

Migrate from the currently broken Rust + Python `test-float-parse` to a Rust implementation. This newer version should be significantly faster (tests execute in parallel with threads, rather than series across multiple processes, which also eliminates the "...the worker processes are leaked and stick around forever" message), and should be significantly easier to extend to the new float types.

Since this is faster and hopefully more stable, we should be able to launch it with `x` and run the faster tests in CI.
2024-07-22 16:44:04 +08:00
Michael Goulet
e9e9495f21 Fix tools 2024-07-21 22:34:37 -04:00
Michael Goulet
ce8a625092 Move all error reporting into rustc_trait_selection 2024-07-21 22:34:35 -04:00
bors
0f8534e79e Auto merge of #120812 - compiler-errors:impl-sorting, r=lcnr
Remove unnecessary impl sorting in queries and metadata

Removes unnecessary impl sorting because queries already return their keys in HIR definition order: https://github.com/rust-lang/rust/issues/120371#issuecomment-1926422838

r? `@cjgillot` or `@lcnr` -- unless I totally misunderstood what was being asked for here? 😆

fixes #120371
2024-07-21 22:43:47 +00:00
bors
92c6c03805 Auto merge of #127993 - weihanglo:update-cargo, r=weihanglo
Update cargo

9 commits in a2b58c3dad4d554ba01ed6c45c41ff85390560f2..5f6b9a92201d78af75dc24f14662c3e2dacbbbe1
2024-07-16 00:52:02 +0000 to 2024-07-19 18:09:17 +0000
- Add `TomlPackage::new`, `Default` for `TomlWorkspace` (rust-lang/cargo#14271)
- fix(test): Move 'cargo_home' from 'install' to 'paths' (rust-lang/cargo#14270)
- fix(test)!: Clarify extension trait role with rename (rust-lang/cargo#14269)
- feat(test): Re-export ProcessBuilder (rust-lang/cargo#14268)
- fix(test): Move path2url to CargoPathExt::to_url (rust-lang/cargo#14266)
- Fix passing of links-overrides with target-applies-to-host and an implicit target (rust-lang/cargo#14205)
- fix(toml): Improve error on missing package and workspace (rust-lang/cargo#14261)
- Migrate global_cache_tracker snapbox (rust-lang/cargo#14244)
- make summary sync by using Arc not Rc (rust-lang/cargo#14260)
2024-07-21 09:06:47 +00:00
bors
2430c48b57 Auto merge of #128011 - matthiaskrgr:rollup-0vmf75y, r=matthiaskrgr
Rollup of 8 pull requests

Successful merges:

 - #127720 ([`macro_metavar_expr_concat`] Allow `concat` in repetitions)
 - #127734 (Windows: move BSD socket shims to netc)
 - #127752 (Ignore allocation bytes in one more mir-opt test)
 - #127839 (Fix git safe-directory path for docker images)
 - #127867 (Add `wasm32-wasip2` to `build-manifest` tool)
 - #127958 (Cleanup rmake.rs setup in compiletest)
 - #127975 (Fix trait bounds display)
 - #128005 (Remove _tls_used hack)

r? `@ghost`
`@rustbot` modify labels: rollup
2024-07-21 00:39:36 +00:00
bors
c1a631d733 Auto merge of #128007 - Mark-Simulacrum:bump-version, r=Mark-Simulacrum
Bump to 1.82

https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before

r? `@Mark-Simulacrum`
2024-07-20 22:14:40 +00:00
Mark Rousskov
94a4279fba Allow deprecated temporarily to unblock version bump 2024-07-20 15:51:58 -04:00
bors
5069856495 Auto merge of #127663 - Oneirical:fuzzy-testure, r=jieyouxu
Migrate 9 more very similar FFI `run-make` tests to rmake

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

For the tracking issue:

- return-non-c-like-enum-from-c
- pass-non-c-like-enum-to-c
- c-static-dylib
- c-static-rlib
- extern-fn-generic
- extern-fn-with-union
- lto-no-link-whole-rlib
- linkage-attr-on-static
- issue-28595
2024-07-20 19:49:49 +00:00
Matthias Krüger
ae28d5c9e7
Rollup merge of #127958 - jieyouxu:compiletest-rmake-cleanup, r=Kobzol
Cleanup rmake.rs setup in compiletest

While debugging rmake.rs tests I realized that the rmake.rs setup itself in compiletest is very messy and confused. Now that I know some of the bootstrap steps and the rmake.rs tests themselves better, I realized there are cleanups that are possible:

- Rework how `source_root` and `build_root` are calculated. They should now be less fragile then before.
- Shuffle around path calculations to make them more logically grouped and closer to eventual use site(s).
- Cleanup executable extension calculation with `std::env::consts::EXE_EXTENSION`.
- Cleanup various dylib search path handling: renamed variables to better reflect their purpose, minimized mutability scope of said variables.
- Prune useless env vars passed to both `rustc` and recipe binary commands.
- Vastly improve the documentation for the setup of rmake.rs tests, including assumed bootstrap-provided build layouts, rmake.rs test layout, dylib search paths, intended purpose of passed env vars and the `COMPILETEST_FORCE_STAGE0=1 ./x test run-make --stage 0` stage0 sysroot special handling.

This PR is best reviewed commit-by-commit.

Fixes https://github.com/rust-lang/rust/issues/127920.

r? bootstrap (or Kobzol, or Mark, or T-compiler)

try-job: aarch64-apple
try-job: armhf-gnu
try-job: dist-x86_64-linux
try-job: test-various
try-job: x86_64-mingw
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
2024-07-20 19:28:59 +02:00
Matthias Krüger
dd8113ef0d
Rollup merge of #127867 - alexcrichton:add-wasm32-wasip2-to-dist-manifest, r=Mark-Simulacrum
Add `wasm32-wasip2` to `build-manifest` tool

This is an accidental omission of mine from #126967 which means that `rustup target add wasm32-wasip2` isn't working on today's nightlies.
2024-07-20 19:28:59 +02:00
Trevor Gross
51827ce4e4 Move test-float-parse to the global workspace
Since `test-float-parse` is now implemented in Rust, we can move it into
the global workspace and check dependency licenses.
2024-07-20 11:39:34 -05:00
Matthias Krüger
8963855ea1
Rollup merge of #127964 - jieyouxu:rmake-rustfmt-skip, r=nnethercote
run_make_support: skip rustfmt for lib.rs

To avoid them getting reordered once https://github.com/rust-lang/rust/pull/125443 goes through.

r? ``@nnethercote`` (since you were working on this)
2024-07-20 13:24:55 +02:00
Matthias Krüger
3a9bfa397d
Rollup merge of #127463 - onur-ozkan:precompiled-rustdoc, r=Kobzol
use precompiled rustdoc with CI rustc

When CI rustc is enabled and rustdoc sources are unchanged, we can use the precompiled rustdoc from the CI rustc's sysroot. This speeds up bootstrapping quite a lot by avoiding unnecessary rustdoc compilation.
2024-07-20 13:24:51 +02:00
许杰友 Jieyou Xu (Joe)
a8463bea91 compiletest/rmake: simplify path calculations 2024-07-20 09:21:57 +00:00
许杰友 Jieyou Xu (Joe)
2c867d0b5f compiletest/rmake: avoid double test directory for rmake.rs tests
This is important for other tests that have various things like modes,
revisions and the like. These features are not supported in run-make
tests, so we don't need the double layering.
2024-07-20 09:20:47 +00:00
许杰友 Jieyou Xu (Joe)
c863525374 compiletest/rmake: improve comments 2024-07-20 09:20:47 +00:00
许杰友 Jieyou Xu (Joe)
3e77f7c9a5 compiletest/rmake: prune unused RUST_BUILD_STAGE and explain env vars passed to recipes 2024-07-20 09:20:32 +00:00
Matthias Krüger
aa6ae4beca
Rollup merge of #127693 - Rejyr:migrate-crate-hash-rustc-version-rmake, r=jieyouxu
Migrate `crate-hash-rustc-version` to `rmake`

Part of #121876.

r? ``@jieyouxu``

try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
2024-07-20 07:13:42 +02:00
Weihang Lo
3ed80a8c30
Update cargo 2024-07-19 17:59:44 -04:00
bors
9057c3ffec Auto merge of #127968 - fmease:upd-jsondocck-directive-style, r=GuillaumeGomez
Update jsondocck directives to follow ui_test-style

Context: Comment chain in #125813.
Follow-up to #126788.
Use the same temporary approach of "double parsing" until we figure out how we want to support compiletest/ui_test directive "add-ons" for child test runners like HtmlDocCk and JsonDocCk.

I didn't touch much of jsondocck because I want to refactor it some other time (for robustness, maintainability and better diagnostics; basically by following a similar design of my WIP HtmlDocCk-next, cc #125780).

r? `@GuillaumeGomez`
2024-07-19 21:07:48 +00:00
Oneirical
2192a916d4 rewrite compiler-lookup-paths-2 to rmake 2024-07-19 16:48:21 -04:00
Oneirical
27334943ed rewrite c-unwind-abi-catch-panic to rmake 2024-07-19 14:39:42 -04:00
Oneirical
7b19389d58 rewrite test-benches to rmake 2024-07-19 14:05:09 -04:00
Oneirical
1f976b43da rewrite linkage-attr-on-static to rmake 2024-07-19 12:27:47 -04:00
Oneirical
db8398db6f rewrite lto-no-link-whole-rlib to rmake 2024-07-19 12:27:47 -04:00
Oneirical
01c7118fa9 rewrite extern-fn-with-union to rmake 2024-07-19 12:27:47 -04:00
Oneirical
8a09f2231d rewrite extern-fn-generic to rmake 2024-07-19 12:27:47 -04:00
Oneirical
1a4fba5eb0 rewrite c-static-rlib to rmake 2024-07-19 12:27:47 -04:00
Oneirical
1ae1ab8215 rewrite c-static-dylib to rmake 2024-07-19 12:27:47 -04:00
Oneirical
5e55f07cc0 rewrite and rename issue-28595 to rmake 2024-07-19 12:27:46 -04:00
Oneirical
5b1860a24e rewrite return-non-c-like-enum-from-c to rmake 2024-07-19 12:27:26 -04:00
bors
0cd01aac6a Auto merge of #127969 - matthiaskrgr:rollup-nhxmwhn, r=matthiaskrgr
Rollup of 7 pull requests

Successful merges:

 - #112328 (Feat. adding ext that returns change_time)
 - #126199 (Add `isqrt` to `NonZero<uN>`)
 - #127856 (interpret: add sanity check in dyn upcast to double-check what codegen does)
 - #127934 (Improve error when a compiler/library build fails in `checktools.sh`)
 - #127960 (Cleanup dll/exe filename calculations in `run_make_support`)
 - #127963 (Fix display of logo "border")
 - #127967 (Disable run-make/split-debuginfo test for RISC-V 64)

r? `@ghost`
`@rustbot` modify labels: rollup
2024-07-19 16:13:37 +00:00