Clean up Cargo.toml #22075
Closed
Clean up Cargo.toml #22075
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
CI/run-audit-deps
|
There's more cleanup to do, but landing this would be helpful reducing diff noise and checking other changes. |
bridiver
reviewed
Feb 21, 2024
| @@ -77,9 +73,57 @@ dependencies = [ | |||
| "winapi", | |||
| ] | |||
|
|
|||
| [[package]] | |||
There was a problem hiding this comment.
what are all these new dependencies?
There was a problem hiding this comment.
anstyle is used by clap_builder which is in upstream chromium. So is anstream but it's optional, so I'm not sure why we're pulling it in. Maybe the thing where cargo locks versions for optional dependencies even if they're not built?
I'll see if we really need the direct dependency on clap.
bitflags is a dep of adblock and is in upstream chromium.
bech32 was added recently for zcash support.
There was a problem hiding this comment.
Resolved in f4b6739. anstyle still replaces terminfo for cxxbridge, but I was able to remove a few other unnecessary entries.
rillian
force-pushed
the
rillian/cargo-cleanup
branch
from
1b8bbe2 to
7a0bda0
Compare
|
Rebased past #22349 to address android ci timeouts. |
rillian
force-pushed
the
rillian/cargo-cleanup
branch
from
7a0bda0 to
d93fa0f
Compare
|
Rebased again to see if it resolved ios ci issue. |
|
Please rebase to fix iOS CI failure |
I assume this was copied from chromium's Cargo.toml, but it isn't relevant here and prevents `cargo` from working with the file.
These crates are vendored in the chromium third_party/rust tree. Update the paths to point there so `cargo` can usefully operate on the description here. NB: I'm unclear if `gnrt` or other automation actually reads these paths, so it may be we can remove them entirely since they're not required by components of brave-core. Leaving them in for now since the full build will certainly use them.
Change patch entries to point to the moved crate sources in chromium and remove some obsolete or conflicting entries.
Propagate Cargo.toml changes to the lockfile by running `cargo check` with rustc 1.76.0 stable from the upstream rust project. At this point cargo is satisfied with the depenencies, but a stand-alone build doesn't complete because of missing `u128` config.
This is a transitive dependency of `cargo-audit` through `miniz_oxide` and is not needed for the browser target.
This is a dependency of `cargo-audit` and is not needed for the browser target.
These are dependencies of `cargo-audit` and is not needed for the browser target.
This is a dependency of `cargo-audit` and is not needed for the browser target. It's a dev-dependency of `ppoprf` but that's not required to incorporate the library code.
Align the vendored source code with the v0.3.1 release specified by `star_constellation`. We were already calling this version that in `BUILD.gn` but the source code corresponded to the v0.3.0 release instead. The only source change is to error handling in the `ppoprf::eval` function which is not used client-side, so there is no behavior change to the browser. This just removes a discrepancy so future vendor diffs will be clean. Addresses an 'patch...was not used' warning when running `cargo` against third_party/rust/Cargo.toml.
Remove the explicit reference the `clap` rust crate from our Cargo.toml. This is used by `cxxbridge` and some test-only code, but isn't needed for the browser target and we can use the upstream chromium version for the rest. Addresses some non-vendored transitive dependencies appearing in Cargo.lock.
This isn't part of the browser target. Removing it cleans unncessary dependencies from Cargo.lock.
Tell a local cargo build to use the copy from chromium.
These were generated running `gnrt` on a branch where that somewhat works, and then manually edited to remove the new 'License File' field. Upstream is using this because their README annotations is in a separate part of the source tree from the actual crate source, but our current style for vendored crates doesn't have that issue. core-foundation-sys is marked as not security-critical. This is used to access the time zone database on macOS, so the input isn't coming from network sources.
For the `patch` diversion in Cargo.toml to work, we need to use an explicit reference to the prelease suffixed version which contains the speedreader-specific code, since pre-release versions aren't considered compatible without it. This lets cargo find and record the correct metadata for the crate version.
This new crate was added after the initial pass, so it was missing from the list of local paths telling cargo where to find the source.
rillian
force-pushed
the
rillian/cargo-cleanup
branch
from
03441cb to
c583d00
Compare
|
This is no longer relevant. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve various discrepancies with rust crates vendored in
third_party/rustppoprfsource to match the declared version.cargoto updateCargo.lockfrom the newCargo.tomlBasically this aligns the Cargo descriptions more with what we actually have in the gn files, which will hopefully reduce diff noise the next time we use gnrt.
Resolves brave/brave-browser#36271
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_testswikinpm run presubmitwiki,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan: