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 5 pull requests #110679

Closed
wants to merge 15 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cjgillot and others added 15 commits April 18, 2023 18:00
- Use `cargo metadata` to determine whether a crate has a library
  package or not
- Collect metadata for all workspaces, not just the root workspace and
  cargo
- Don't pass `--lib` for crates without a library
- Use `run_cargo_test` for rust-installer
- Don't build documentation in `lint-docs` if `--no-doc` is passed
Refactor `SyntaxContext::ctxt` logic.

I'm still trying to make a test from the issue.

cc `@deepink-mas` does this solve the issue?

Fixes rust-lang#110230
…levant_impl, r=b-naber

Remove `find_map_relevant_impl`

Fixes rust-lang#108895
bootstrap: Unify test argument handling

Fixes rust-lang#104198. Does *not* help with rust-lang#80124 because I couldn't figure out a reasonable way to omit `--lib` only for `panic_abort` and not other `std` dependencies.

- Remove unnecessary `test_kind` field and `TestKind` struct. These are just subsets of the existing `builder.kind` / `Kind` struct.
- Add a new `run_cargo_test` function which handles passing arguments to cargo based on `builder.config`
- Switch all Steps in `mod test` to `run_cargo_test` where possible
- Combine several steps into one `CrateBootstrap` step. These tests all do the same thing, just with different crate names.
- Fix `x test --no-doc`. This is much simpler after the refactors mentioned earlier, but I'm happy to split it into a separate PR if desired. Before, this would panic a lot because steps forgot to pass `--lib`.
…t, r=jyn514

stop `x fmt` formatting untracked directories

I don't think there's anything else to do? I've confirmed that you get a "skip untracked path foo/ during rustfmt invocations" for the alternative build directory.

r? `@jyn514`
…e-asm, r=workingjubilee

allow array-style simd in inline asm

Required for [MCP#621](rust-lang/compiler-team#621) to be implemented.

r? `@workingjubilee`
@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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Apr 22, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 22, 2023

📌 Commit f4c51bf has been approved by matthiaskrgr

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 22, 2023
@bors
Copy link
Contributor

bors commented Apr 22, 2023

⌛ Testing commit f4c51bf with merge 41d3d549c722ccc220a0224172f6243abd66b517...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
test [assembly] tests/assembly/x86-stack-probes.rs#i686 ... ok

failures:

---- [assembly] tests/assembly/asm/inline-asm-avx.rs stdout ----
error: compilation failed!
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/assembly/asm/inline-asm-avx.rs" "-Zthreads=1" "--sysroot" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2" "-O" "--emit" "asm" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/assembly/asm/inline-asm-avx/inline-asm-avx.s" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/assembly/asm/inline-asm-avx/auxiliary" "--crate-type=lib" "--target" "x86_64-unknown-linux-gnu"
stdout: none
error[E0463]: can't find crate for `std`
  |
  |
  = note: the `x86_64-unknown-linux-gnu` target may not be installed
  = help: consider downloading the target with `rustup target add x86_64-unknown-linux-gnu`
  = help: consider building the standard library from source with `cargo build -Zbuild-std`
error: cannot determine resolution for the macro `asm`
  --> /checkout/tests/assembly/asm/inline-asm-avx.rs:18:9
   |
18 |         asm!(
18 |         asm!(
   |         ^^^
   |
   = note: import resolution is stuck, try simplifying macro imports
error[E0635]: unknown feature `portable_simd`
 --> /checkout/tests/assembly/asm/inline-asm-avx.rs:6:12
  |
6 | #![feature(portable_simd)]
---



failures:
    [assembly] tests/assembly/asm/inline-asm-avx.rs
test result: FAILED. 124 passed; 1 failed; 29 ignored; 0 measured; 0 filtered out; finished in 698.74ms

Some tests failed in compiletest suite=assembly mode=assembly host=aarch64-unknown-linux-gnu target=aarch64-unknown-linux-gnu
Build completed unsuccessfully in 0:18:57

@bors
Copy link
Contributor

bors commented Apr 22, 2023

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 22, 2023
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 22, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-kumtjfx branch March 16, 2024 18:19
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. 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. 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.

8 participants