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

Partially update library/Cargo.lock #130892

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Sep 26, 2024

Run cargo update in library but exclude updates to cc and to compiler_builtins. Exclusions were done because cc seems to have some issues updating 1, and compiler_builtins needs to be updated on its own.

Partially supersedes #129538.

try-job: x86_64-msvc

Run `cargo update` in library but exclude updates to `cc` and to
`compiler_builtins`. Exclusions were done because `cc` seems to have
some issues updating [1], and `compiler_builtins` needs to be updated on
its own.

[1]: rust-lang#130720
@rustbot
Copy link
Collaborator

rustbot commented Sep 26, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Sep 26, 2024

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2024
@tgross35
Copy link
Contributor Author

Let's see if this can pass msvc where #130720 fails.

@bors try

cc @Noratrieb if I could get a r=you, since you checked the other one

@bors
Copy link
Contributor

bors commented Sep 26, 2024

⌛ Trying commit fa64fb1 with merge ae18f53...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2024
Partially update `library/Cargo.lock`

Run `cargo update` in library but exclude updates to `cc` and to `compiler_builtins`. Exclusions were done because `cc` seems to have some issues updating [1], and `compiler_builtins` needs to be updated on its own.

[1]: rust-lang#130720

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Sep 26, 2024

☀️ Try build successful - checks-actions
Build commit: ae18f53 (ae18f538cbcd66ff3b66aea1d575827202e27cb4)

@tgross35
Copy link
Contributor Author

Woo! Thanks for taking a look Nora

@bors r=Noratrieb

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit fa64fb1 has been approved by Noratrieb

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 added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2024
…kingjubilee

Rollup of 8 pull requests

Successful merges:

 - rust-lang#130313 ([`cfg_match`] Generalize inputs)
 - rust-lang#130706 ([rustdoc] Remove unneeded jinja comments)
 - rust-lang#130846 (Revert Break into the debugger on panic (129019))
 - rust-lang#130875 (update `compiler-builtins` to 0.1.126)
 - rust-lang#130889 (Weekly `cargo update`: only `rustbook`)
 - rust-lang#130892 (Partially update `library/Cargo.lock`)
 - rust-lang#130911 (diagnostics: wrap fn cast suggestions in parens when needed)
 - rust-lang#130912 (On implicit `Sized` bound on fn argument, point at type instead of pattern)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 081b946 into rust-lang:master Sep 27, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 27, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2024
Rollup merge of rust-lang#130892 - tgross35:library-cargo-update, r=Noratrieb

Partially update `library/Cargo.lock`

Run `cargo update` in library but exclude updates to `cc` and to `compiler_builtins`. Exclusions were done because `cc` seems to have some issues updating [1], and `compiler_builtins` needs to be updated on its own.

Partially supersedes rust-lang#129538.

[1]: rust-lang#130720

try-job: x86_64-msvc
@tgross35 tgross35 deleted the library-cargo-update branch September 27, 2024 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants