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

[beta] backports #130888

Merged
merged 4 commits into from
Sep 27, 2024
Merged

[beta] backports #130888

merged 4 commits into from
Sep 27, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Sep 26, 2024

r? cuviper

compiler-errors and others added 4 commits September 26, 2024 08:46
@compiler-errors @cuviper
Use equality when relating formal and expected type in arg checking
91b117b 
(cherry picked from commit c3f9c4f)
@compiler-errors @cuviper
Inline expected_inputs_for_expected_output into check_argument_types/…
824971f 
…check_expr_struct_fields

(cherry picked from commit 95b9ecd)
@compiler-errors @cuviper
Don't call extern_crate when local crate name is the same as a depend…
3cb89a0 
…ency and we have a trait error

(cherry picked from commit 9d5d03b)
@cuviper
bootstrap: Set the dylib path when building books with rustdoc
1ddfc90 
The library path is needed when the toolchain has been configured with
`[rust] rpath = false`. Otherwise, building the reference book will get
an error when it tries to run rustdoc, like:

    rustdoc: error while loading shared libraries: librustc_driver-2ec457c3b8826b72.so

(cherry picked from commit de4c897)
@rustbot
Copy link
Collaborator

rustbot commented Sep 26, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@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. labels Sep 26, 2024
@cuviper
Copy link
Member Author

cuviper commented Sep 26, 2024

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit 1ddfc90 has been approved by cuviper

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 Sep 26, 2024
@bors
Copy link
Contributor

bors commented Sep 27, 2024

⌛ Testing commit 1ddfc90 with merge 1bc109c...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2024
@bors
Auto merge of rust-lang#130888 - cuviper:beta-next, r=cuviper
1bc109c 
[beta] backports

- Use equality when relating formal and expected type in arg checking rust-lang#129317
- Don't call `extern_crate` when local crate name is the same as a dependency and we have a trait error rust-lang#130275
- bootstrap: Set the dylib path when building books with rustdoc rust-lang#130536

r? cuviper
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] miri test:false 4.430
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Fri, Sep 27, 2024  5:01:30 AM
  network time: Fri, 27 Sep 2024 05:01:30 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Sep 27, 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 Sep 27, 2024
@cuviper
Copy link
Member Author

cuviper commented Sep 27, 2024

@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 Sep 27, 2024
@bors
Copy link
Contributor

bors commented Sep 27, 2024

⌛ Testing commit 1ddfc90 with merge 6a3b69c...

@bors
Copy link
Contributor

bors commented Sep 27, 2024

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 6a3b69c to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 27, 2024
@bors bors merged commit 6a3b69c into rust-lang:beta Sep 27, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Sep 27, 2024
@cuviper cuviper deleted the beta-next branch September 27, 2024 21:59
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Oct 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
5 participants
@cuviper @rustbot @bors @rust-log-analyzer @compiler-errors