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.

Sign up for GitHub

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

Jump to bottom

Rollup of 5 pull requests #110216

Closed
wants to merge 17 commits into from
Closed

Rollup of 5 pull requests #110216

wants to merge 17 commits into from

Conversation

compiler-errors
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fee1-dead and others added 17 commits April 8, 2023 09:38
@fee1-dead
bump futures to use syn 2.0
2c64688
@jyn514
Separate out a rustc_llvm_env function
fb92796
@DaniPopes
Fix typos in compiler
677357d
@DaniPopes
Update ty_utils_never_to_any_not_supported diagnostic message
f06640d
@DaniPopes
Revert method-not-found-generic-arg-elision test bless
40f12c6
@jyn514
Fix x check --stage 1 when download-ci-llvm=false
ca3daa0
@nnethercote
Introduce Region::get_name_or_anon.
5716ae6 
For a common pattern.
@nnethercote
Fix RegionCtxt::preference_value.
1eb5390 
There's a bad pattern matching confusion present in this function.
`_anon` gets assigned to, and then `_anon` is used as an unbound
variable in the pattern, which is unrelated to the first `_anon`.
If the `_anon` didn't start with `_` the compiler would give warnings.

This was introduced in rust-lang#104239.

I have rewritten the function to remove the confusion and preserve the
existing behaviour. This seems safest, because the original intent is
not clear.
@nnethercote
Use the existing static and env symbols instead of interning.
bd7f301
@nnethercote
Add sym::anon.
7975779
@fee1-dead
bump treewide clap to 4.2.1
b4fe761
@fee1-dead
include raw feature for hashbrown in workspace hack
bcc8315
@compiler-errors
Rollup merge of rust-lang#110077 - fee1-dead-contrib:time-to-bump, r=…
a3ec0ea 
…Mark-Simulacrum

bump treewide clap to 4.2.1

cc rust-lang#109302
@compiler-errors
Rollup merge of rust-lang#110079 - fee1-dead-contrib:bump-futures, r=…
fefd04a 
…Mark-Simulacrum

bump `futures` to use syn 2.0

cc rust-lang#109302
@compiler-errors
Rollup merge of rust-lang#110122 - jyn514:check-stage1-llvm, r=ozkanonur
1d6a85f 
Fix x check --stage 1 when download-ci-llvm=false

Bootstrap tries to avoid building LLVM unless it needs to; in particular we only build it for `x build`, not `x check`. Unfortunately, the check forgot about existence of stages - it would break if you used `x check --stage 1`:
```
  = note: /usr/bin/ld: cannot find -lPolly: No such file or directory
          /usr/bin/ld: cannot find -lPollyISL: No such file or directory
```
Fix it to work for stage 1.

I recommend reading this commit-by-commit; the first one makes a bunch of whitespace changes but otherwise doesn't change the logic.
@compiler-errors
Rollup merge of rust-lang#110153 - DaniPopes:compiler-typos, r=Nilstrieb
b5a6f8d 
Fix typos in compiler

I ran [`typos -w compiler`](https://github.com/crate-ci/typos) to fix typos in the `compiler` directory.

Refs rust-lang#110150
@compiler-errors
Rollup merge of rust-lang#110175 - nnethercote:symbol-cleanups, r=jac…
318e82d 
…kh726

Symbol cleanups

r? ``@jackh726``

cc ``@b-naber``
@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Apr 12, 2023
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 12, 2023

📌 Commit 318e82d has been approved by compiler-errors

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

bors commented Apr 12, 2023

⌛ Testing commit 318e82d with merge 9e9fe78e6cd20319820d04f320e302329b0a0a01...

@bors
Copy link
Contributor

bors commented Apr 12, 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 12, 2023
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 12, 2023
@fee1-dead
Copy link
Member

fee1-dead commented Apr 12, 2023 •
edited
Loading

My PR failed this.

@fee1-dead fee1-dead closed this Apr 12, 2023
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] rustc_workspace_hack test:false 0.059
   Compiling rls v2.0.0 (C:\a\rust\rust\src\tools\rls)
[RUSTC-TIMING] rls test:false 1.573
    Finished release [optimized] target(s) in 1m 23s
duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
the following dependencies have different features:
the following dependencies have different features:
  windows-sys 0.45.0 (registry+https://github.com/rust-lang/crates.io-index)
    `rls` additionally enabled features {} at "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwindows_sys-10be35956adfb82f.rlib"
    `cargo` additionally enabled features {"Win32_System_SystemServices", "Win32_System_IO", "Win32_System_Threading", "Win32_Security", "Win32_System_JobObjects"} at "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwindows_sys-017053a858ddbe8e.rlib"
  windows-sys 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)
    `rls` additionally enabled features {} at "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwindows_sys-4a646961a669c101.rlib"
    `cargo` additionally enabled features {"Win32_System_WindowsProgramming", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_LibraryLoader"} at "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwindows_sys-f50abfd148aec17b.rlib"
  winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)
    `rls` additionally enabled features {} at "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwinapi-ee48548943c65f3e.rlib"
    `cargo` additionally enabled features {"std", "fileapi", "winerror"} at "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwinapi-e5d0ce59fd6ee153.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
thread 'main' panicked at 'tools should not compile multiple copies of the same crate', tool.rs:250:13
Build completed unsuccessfully in 0:49:46

@compiler-errors compiler-errors deleted the rollup-591q3fc branch August 11, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@compiler-errors @bors @fee1-dead @rust-log-analyzer @rustbot @jyn514 @DaniPopes @nnethercote