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

Update some deps with bitflags v1 dependencies #120215

Merged
merged 2 commits into from
Jan 23, 2024

Conversation

clubby789
Copy link
Contributor

This only leaves pulldown-cmark (which has updated to bitflags v2 in Git) and rustc_apfloat (PR opened previously at rust-lang/rustc_apfloat#12)

@rustbot
Copy link
Collaborator

rustbot commented Jan 21, 2024

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Jan 21, 2024

These commits modify the Cargo.lock file. Unintentional changes to 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 Jan 21, 2024
@Noratrieb
Copy link
Member

@bors r+

Would be cool if you could unblock #112865, by pinning cc or fixing the issue. Then this could be automatic.

@bors
Copy link
Contributor

bors commented Jan 23, 2024

📌 Commit c751720 has been approved by Nilstrieb

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 Jan 23, 2024
fmease added a commit to fmease/rust that referenced this pull request Jan 23, 2024
Update some deps with `bitflags` v1 dependencies

This only leaves `pulldown-cmark` (which has updated to bitflags v2 in Git) and `rustc_apfloat` (PR opened previously at rust-lang/rustc_apfloat#12)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2024
Rollup of 13 pull requests

Successful merges:

 - rust-lang#119028 (Add more weirdness to weird-exprs.rs)
 - rust-lang#119805 (Suggest array::from_fn for array initialization)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120177 (Remove duplicate dependencies for rustc)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120188 (compiler: update freebsd and netbsd base specs.)
 - rust-lang#120201 (Bump some deps with syn 1.0 dependencies)
 - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies)
 - rust-lang#120244 (Use `Self` in `NonZero*` implementations.)
 - rust-lang#120246 (Re-add estebank to review rotation)
 - rust-lang#120252 (rename `RawTy` to `LoweredTy`)
 - rust-lang#120255 (correct my mailmap entry)
 - rust-lang#120270 (A bunch of random modifications)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2024
Rollup of 13 pull requests

Successful merges:

 - rust-lang#119028 (Add more weirdness to weird-exprs.rs)
 - rust-lang#119805 (Suggest array::from_fn for array initialization)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120177 (Remove duplicate dependencies for rustc)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120188 (compiler: update freebsd and netbsd base specs.)
 - rust-lang#120201 (Bump some deps with syn 1.0 dependencies)
 - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies)
 - rust-lang#120244 (Use `Self` in `NonZero*` implementations.)
 - rust-lang#120246 (Re-add estebank to review rotation)
 - rust-lang#120252 (rename `RawTy` to `LoweredTy`)
 - rust-lang#120255 (correct my mailmap entry)
 - rust-lang#120270 (A bunch of random modifications)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2024
Rollup of 10 pull requests

Successful merges:

 - rust-lang#119028 (Add more weirdness to weird-exprs.rs)
 - rust-lang#119805 (Suggest array::from_fn for array initialization)
 - rust-lang#120188 (compiler: update freebsd and netbsd base specs.)
 - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies)
 - rust-lang#120244 (Use `Self` in `NonZero*` implementations.)
 - rust-lang#120246 (Re-add estebank to review rotation)
 - rust-lang#120252 (rename `RawTy` to `LoweredTy`)
 - rust-lang#120255 (correct my mailmap entry)
 - rust-lang#120270 (A bunch of random modifications)
 - rust-lang#120280 (Move condition enabling the pass to `is_enabled`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 09c31b8 into rust-lang:master Jan 23, 2024
11 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2024
Rollup merge of rust-lang#120215 - clubby789:dep-updates, r=Nilstrieb

Update some deps with `bitflags` v1 dependencies

This only leaves `pulldown-cmark` (which has updated to bitflags v2 in Git) and `rustc_apfloat` (PR opened previously at rust-lang/rustc_apfloat#12)
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