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 object dependency to remove duplicate wasmparser #129860

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

lqd
Copy link
Member

@lqd lqd commented Sep 1, 2024

@alexcrichton in #129762 you bumped a few wasm-related dependencies and tried to avoid duplicates.

If I understand correctly, object 0.36.4 wasn't yet released at the time, and therefore #129762 ended up duplicating wasmparser. Now that the release happened, we can remove the duplicate.

r? @alexcrichton

@rustbot
Copy link
Collaborator

rustbot commented Sep 1, 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 Sep 1, 2024
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 1, 2024

📌 Commit d30b5f0 has been approved by alexcrichton

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 1, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 2, 2024
…richton

update `object` dependency to remove duplicate `wasmparser`

`@alexcrichton` in rust-lang#129762 you bumped a few wasm-related dependencies and tried to avoid duplicates.

If I understand correctly, `object` 0.36.4 wasn't yet released at the time, and therefore rust-lang#129762 ended up duplicating `wasmparser`. Now that the release happened, we can remove the duplicate.

r? `@alexcrichton`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 2, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#129152 (custom/external clippy support for bootstrapping)
 - rust-lang#129529 (Add test to build crates used by r-a on stable)
 - rust-lang#129829 (Make decoding non-optional `LazyArray` panic if not set)
 - rust-lang#129860 (update `object` dependency to remove duplicate `wasmparser`)
 - rust-lang#129875 (chore: Fix typos in 'compiler' (batch 1))
 - rust-lang#129877 (chore: Fix typos in 'compiler' (batch 2))
 - rust-lang#129878 (chore: Fix typos in 'compiler' (batch 3))
 - rust-lang#129891 (Do not request sanitizers for naked functions)
 - rust-lang#129892 (Clarify language around ptrs in slice::raw)

Failed merges:

 - rust-lang#129777 (Add `unreachable_pub`, round 4)
 - rust-lang#129868 (Remove kobzol vacation status)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 3, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#129152 (custom/external clippy support for bootstrapping)
 - rust-lang#129311 (don't copy `.rustc-dev-contents` from CI rustc)
 - rust-lang#129800 (Move the Windows remove_dir_all impl into a module and make it more race resistant)
 - rust-lang#129860 (update `object` dependency to remove duplicate `wasmparser`)
 - rust-lang#129885 (chore: remove repetitive words)
 - rust-lang#129913 (Add missing read_buf stub for x86_64-unknown-l4re-uclibc)
 - rust-lang#129916 (process.rs: remove "Basic usage" text where not useful)
 - rust-lang#129917 (Fix parsing of beta version in dry-run mode)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e9cd996 into rust-lang:master Sep 3, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 3, 2024
Rollup merge of rust-lang#129860 - lqd:remove-duplicate-deps, r=alexcrichton

update `object` dependency to remove duplicate `wasmparser`

``@alexcrichton`` in rust-lang#129762 you bumped a few wasm-related dependencies and tried to avoid duplicates.

If I understand correctly, `object` 0.36.4 wasn't yet released at the time, and therefore rust-lang#129762 ended up duplicating `wasmparser`. Now that the release happened, we can remove the duplicate.

r? ``@alexcrichton``
@lqd lqd deleted the remove-duplicate-deps branch September 3, 2024 08:22
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.

4 participants