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

deps: dedup object, wasmparser, wasm-encoder #127860

Merged
merged 2 commits into from
Jul 28, 2024
Merged

deps: dedup object, wasmparser, wasm-encoder #127860

merged 2 commits into from
Jul 28, 2024

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jul 17, 2024 •
edited
Loading

  • dedups one object, additional dupe will be removed, with next thorin-dwp update
  • wasmparser pinned to minor versions, so full merge isn't possible
  • same with wasm-encoder

Turned off some features for wasmparser (see features https://github.com/bytecodealliance/wasm-tools/blob/v1.208.1/crates/wasmparser/Cargo.toml) in run-make-support, looks working?

@rustbot
Copy link
Collaborator

rustbot commented Jul 17, 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 Jul 17, 2024

The run-make-support library was changed

cc @jieyouxu

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 A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 17, 2024
@klensy klensy changed the title deps: dedup some of objects and wasmparser deps: dedup object, wasmparser, wasm-encoder Jul 17, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@klensy
Copy link
Contributor Author

klensy commented Jul 17, 2024

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@klensy
Copy link
Contributor Author

klensy commented Jul 21, 2024

libpanic_unwind-4f01f359c61a0a5e.rlib(lib.rmeta): SHT_STRTAB string table section [index 4] is empty Oh.

@klensy klensy mentioned this pull request Jul 21, 2024
Closed
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like O-windows Operating system: Windows T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 24, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 24, 2024

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@klensy
Copy link
Contributor Author

klensy commented Jul 24, 2024

Sorry for ping, wrong rebase.

@klensy
Copy link
Contributor Author

klensy commented Jul 24, 2024

@rustbot ready

there was an issue with object, that was fixed by gimli-rs/object#710

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 24, 2024
@Mark-Simulacrum
Copy link
Member

r=me with some squashing/cleanup

klensy added 2 commits July 28, 2024 17:21
@klensy
dedup object
58c9999 
waiting on thorin-dwp update

dedup one wasmparser

run-make-support: drop some features for wasmparser

dedupe wasm-encoder
@klensy
adopt object changes
8754710 
adopt wasm_encoder changes
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 28, 2024

📌 Commit 8754710 has been approved by Mark-Simulacrum

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 Jul 28, 2024
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 28, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 28, 2024
@bors
Auto merge of rust-lang#128313 - GuillaumeGomez:rollup-kacb489, r=Gui…
2cbbe8b 
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#125779 ([rustdoc] Add copy code feature)
 - rust-lang#127765 (Fix doc nits)
 - rust-lang#127860 (deps: dedup object, wasmparser, wasm-encoder)
 - rust-lang#128103 (add `is_multiple_of` for unsigned integer types)
 - rust-lang#128228 (Stabilize `const_waker`)
 - rust-lang#128240 (Add links from `assert_eq!` docs to `debug_assert_eq!`, etc.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 19feb90 into rust-lang:master Jul 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 28, 2024
@rust-timer
Unrolled build for rust-lang#127860
4872663 
Rollup merge of rust-lang#127860 - klensy:dedup, r=Mark-Simulacrum

deps: dedup object, wasmparser, wasm-encoder

* dedups one `object`, additional dupe will be removed, with next `thorin-dwp` update
* `wasmparser` pinned to minor versions, so full merge isn't possible
* same with `wasm-encoder`

Turned off some features for `wasmparser` (see features https://github.com/bytecodealliance/wasm-tools/blob/v1.208.1/crates/wasmparser/Cargo.toml) in `run-make-support`, looks working?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philipc philipc philipc left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like O-windows Operating system: Windows 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
Oxidizing run-make tests
Status: Done
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
6 participants
@klensy @rustbot @rust-log-analyzer @Mark-Simulacrum @bors @philipc