Skip to content
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

Rollup of 7 pull requests #128999

Closed
wants to merge 44 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kobzol and others added 30 commits August 9, 2024 16:19
To remove a side effect (process exit) when parsing config.
Co-authored-by: Georg Semmler <github@weiznich.de>
All regressions that were blocking usage of ArArchiveBuilder should now
be fixed.
compiler-errors and others added 8 commits August 11, 2024 19:40
…, r=lcnr

Normalize struct tail properly for `dyn` ptr-to-ptr casting in new solver

Realized that the new solver didn't handle ptr-to-ptr casting correctly.

r? lcnr

Built on rust-lang#128694
Slightly refactor `Flags` in bootstrap

The next step for rust-lang#126819 is to track commands executed inside `Config::parse`. This is quite challenging, because (tracked) command execution needs to access some state that is stored inside `Config`, which creates a sort of a chicken-and-egg problem.

I would like to first untangle `Config::parse` a little bit, which is what this PR starts with.

Tracking issue: rust-lang#126819

r? `@onur-ozkan`
…stic, r=nnethercote

Get rid of some `#[allow(rustc::untranslatable_diagnostic)]`

``@rustbot`` label +A-translation
cc rust-lang#100717
…mpl, r=lcnr

Store `do_not_recommend`-ness in impl header

Alternative to rust-lang#128674

It's less flexible, but also less invasive. Hopefully it's also performant. I'd recommend we think separately about the design for how to gate arbitrary diagnostic attributes moving forward.
…=jieyouxu

Support reading thin archives in ArArchiveBuilder

And switch to using ArArchiveBuilder with the LLVM backend too now that all regressions are fixed.

Fixes rust-lang#107407
Fixes rust-lang#107162
rust-lang#107495 has been fixed in a previous PR already.
Fix warnings in rmake tests on `x86_64-unknown-linux-gnu`

r? `````@jieyouxu`````

This PR fixes some warnings I saw in rmake tests. I didn't deny more warnings in this PR until `````@jieyouxu````` gives their opinion, but maybe we should actually deny all warnings in `rmake.rs` files?

I've also only looked at non-ignored tests on `x86_64-unknown-linux-gnu`, and denying warnings would require a try build for all targets 😓.
…jieyouxu

Use `assert_matches` around the compiler more

It's a useful assertion, especially since it actually prints out the LHS.
@rustbot rustbot added the rollup A PR which is a rollup label Aug 12, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Aug 12, 2024

📌 Commit 7004267 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 12, 2024
@bors
Copy link
Contributor

bors commented Aug 12, 2024

⌛ Testing commit 7004267 with merge 94b7ab4...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#128712 (Normalize struct tail properly for `dyn` ptr-to-ptr casting in new solver)
 - rust-lang#128878 (Slightly refactor `Flags` in bootstrap)
 - rust-lang#128886 (Get rid of some `#[allow(rustc::untranslatable_diagnostic)]`)
 - rust-lang#128912 (Store `do_not_recommend`-ness in impl header)
 - rust-lang#128936 (Support reading thin archives in ArArchiveBuilder)
 - rust-lang#128937 (Fix warnings in rmake tests on `x86_64-unknown-linux-gnu`)
 - rust-lang#128978 (Use `assert_matches` around the compiler more)

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

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] alloc test:false 4.176
[RUSTC-TIMING] hashbrown test:false 0.928
error: linking with `link.exe` failed: exit code: 1377
  |
  = note: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\bin\\HostX64\\arm64\\link.exe" "/DEF:C:\\a\\_temp\\msys64\\tmp\\rustcMwz3Wp\\lib.def" "/NOLOGO" "C:\\a\\_temp\\msys64\\tmp\\rustcMwz3Wp\\symbols.o" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.std.687c30f5203d2da6-cgu.0.rcgu.o" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.1inuthj6eyta4irgnb5n3p42p.rcgu.rmeta" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.40dqg9v34lss4ibw41tumss99.rcgu.o" "kernel32.lib" "advapi32.lib" "ntdll.lib" "userenv.lib" "ws2_32.lib" "kernel32.lib" "kernel32.lib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libpanic_unwind-0efe51103e5c69a8.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\librustc_demangle-b5dad2747c54eac6.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libstd_detect-a96be7d5c08e8ce9.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libhashbrown-9e99af91d46c90ca.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\librustc_std_workspace_alloc-bd15686afc4774c8.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libunwind-cb21b392dc9e1009.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libcfg_if-6492e89f82c5692f.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\liballoc-5fce44712e185115.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\librustc_std_workspace_core-61c63f49152d0b08.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libcore-8a42f9c0bcd12e1b.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libcompiler_builtins-81404ba7c8da1ef5.rlib" "/defaultlib:libcmt" "C:\\a\\_temp\\msys64\\tmp\\rustcMwz3Wp\\bcryptprimitives.dll_imports.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcMwz3Wp\\api-ms-win-core-synch-l1-2-0.dll_imports.lib" "/machine:arm64ec" "softintrin.lib" "/NXCOMPAT" "/LIBPATH:C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\atlmfc\\lib\\arm64" "/LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\build\\compiler_builtins-baacad15725d9096\\out" "/LIBPATH:C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\atlmfc\\lib\\arm64" "/LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\build\\profiler_builtins-5dcbcbd5a1eb0b00\\out" "/OUT:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.dll" "/OPT:REF,ICF" "/DLL" "/IMPLIB:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.dll.lib" "/DEBUG" "/PDBALTPATH:%_PDB%"
  = note: libpanic_unwind-0efe51103e5c69a8.rlib(panic_unwind-0efe51103e5c69a8.panic_unwind.651ad863bcc1bdaa-cgu.0.rcgu.o) : fatal error LNK1377: '#_ZN4core6option13unwrap_failed17he75368b7737afd8aE' symbol not found in object. The containing library is corrupt.␍

[RUSTC-TIMING] std test:false 12.307
error: could not compile `std` (lib) due to 1 previous error
Build completed unsuccessfully in 0:54:40

@bors
Copy link
Contributor

bors commented Aug 12, 2024

💔 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 Aug 12, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry

@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 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#128712 (Normalize struct tail properly for `dyn` ptr-to-ptr casting in new solver)
 - rust-lang#128878 (Slightly refactor `Flags` in bootstrap)
 - rust-lang#128886 (Get rid of some `#[allow(rustc::untranslatable_diagnostic)]`)
 - rust-lang#128912 (Store `do_not_recommend`-ness in impl header)
 - rust-lang#128936 (Support reading thin archives in ArArchiveBuilder)
 - rust-lang#128937 (Fix warnings in rmake tests on `x86_64-unknown-linux-gnu`)
 - rust-lang#128978 (Use `assert_matches` around the compiler more)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Aug 12, 2024

⌛ Testing commit 7004267 with merge 6d55def...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] alloc test:false 4.238
[RUSTC-TIMING] hashbrown test:false 0.989
error: linking with `link.exe` failed: exit code: 1377
  |
  = note: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\bin\\HostX64\\arm64\\link.exe" "/DEF:C:\\a\\_temp\\msys64\\tmp\\rustcLuHLLt\\lib.def" "/NOLOGO" "C:\\a\\_temp\\msys64\\tmp\\rustcLuHLLt\\symbols.o" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.std.d58601137baefb58-cgu.0.rcgu.o" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.esos0tuopiy4mpf9ue8pf3ap8.rcgu.rmeta" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.at646aav1vymgyajc19i3mu6k.rcgu.o" "kernel32.lib" "advapi32.lib" "ntdll.lib" "userenv.lib" "ws2_32.lib" "kernel32.lib" "kernel32.lib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libpanic_unwind-0efe51103e5c69a8.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\librustc_demangle-b5dad2747c54eac6.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libstd_detect-a96be7d5c08e8ce9.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libhashbrown-9e99af91d46c90ca.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\librustc_std_workspace_alloc-bd15686afc4774c8.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libunwind-cb21b392dc9e1009.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libcfg_if-6492e89f82c5692f.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\liballoc-5fce44712e185115.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\librustc_std_workspace_core-61c63f49152d0b08.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libcore-8a42f9c0bcd12e1b.rlib" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\libcompiler_builtins-81404ba7c8da1ef5.rlib" "/defaultlib:libcmt" "C:\\a\\_temp\\msys64\\tmp\\rustcLuHLLt\\bcryptprimitives.dll_imports.lib" "C:\\a\\_temp\\msys64\\tmp\\rustcLuHLLt\\api-ms-win-core-synch-l1-2-0.dll_imports.lib" "/machine:arm64ec" "softintrin.lib" "/NXCOMPAT" "/LIBPATH:C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\atlmfc\\lib\\arm64" "/LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\build\\compiler_builtins-baacad15725d9096\\out" "/LIBPATH:C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.40.33807\\atlmfc\\lib\\arm64" "/LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\build\\profiler_builtins-5dcbcbd5a1eb0b00\\out" "/OUT:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.dll" "/OPT:REF,ICF" "/DLL" "/IMPLIB:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-std\\arm64ec-pc-windows-msvc\\release\\deps\\std-2d4a12d5a1b0960c.dll.lib" "/DEBUG" "/PDBALTPATH:%_PDB%"
  = note: libpanic_unwind-0efe51103e5c69a8.rlib(panic_unwind-0efe51103e5c69a8.panic_unwind.a7423883fa9c80b0-cgu.0.rcgu.o) : fatal error LNK1377: '#_ZN4core6option13unwrap_failed17h164f56ee46840696E' symbol not found in object. The containing library is corrupt.␍

[RUSTC-TIMING] std test:false 12.512
error: could not compile `std` (lib) due to 1 previous error
Build completed unsuccessfully in 0:55:25

@bors
Copy link
Contributor

bors commented Aug 12, 2024

💔 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 Aug 12, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-pb6141p branch September 1, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants