move rust crates to chromium_crate_io #21759

bridiver · 2024-01-26T00:02:55Z

Resolves brave/brave-browser#36271

Submitter Checklist:

I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
There is a ticket for my issue
Used Github auto-closing keywords in the PR description above
Wrote a good PR/commit description
Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
Checked the PR locally:
- npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
- npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
Ran git rebase master (if needed)

Reviewer Checklist:

A security review is not needed, or a link to one is included in the PR description
New files have MPL-2.0 license header
Adequate test coverage exists to prevent regressions
Major classes, functions and non-trivial code blocks are well-commented
Changes in component dependencies are properly reflected in gn
Code follows the style guide
Test plan is specified in PR before merging

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on
All relevant documentation has been updated, for instance:

Test Plan:

rillian · 2024-01-29T21:00:50Z

As usual, it would help future archaeologists if you included an overview of the change and its motivation in the commit message and/or PR desecription. From a brief look at the code it seems like:

Upstream chromium has changed the way they're vendoring third-party crates to use more of cargo's capabilities.
Instead of third_party/rust/crate_name/vX_Y/crate the third party source is in third_party/rust/chromium_crates_io/vendor/crate-X.Y.Z. First party metadata and build description for gn remain in the old location with the third party source referenced from there.

The indent change on line 161 of script/brave_license_helper.py seems spurious (.vscode comment).

I noticed the adblock version numbers don't all match, but that's true of the main branch as well. Looks like things have been moved into //brave/third_party/rust/chromium_crates_io/vendor/ rather than these being fresh copies from crates.io?

Splitting the source changes and file moves into separate commits might help the github review interface not fall over. :(

bridiver · 2024-02-01T14:15:11Z

The indent change on line 161 of script/brave_license_helper.py seems spurious (.vscode comment).

clang format applies to the whole file

bridiver · 2024-02-01T14:15:57Z

I noticed the adblock version numbers don't all match, but that's true of the main branch as well. Looks like things have been moved into //brave/third_party/rust/chromium_crates_io/vendor/ rather than these being fresh copies from crates.io?

This is definitely a fresh download from crates.io, although 3 days ago that may not have been the case

bridiver · 2024-02-01T14:16:24Z

As usual, it would help future archaeologists if you included an overview of the change and its motivation in the commit message and/or PR desecription. From a brief look at the code it seems like:

I intend to squash the commits

brave-builds · 2024-03-06T23:52:42Z

A Storybook has been deployed to preview UI for the latest push

socket-security · 2024-03-07T13:39:46Z

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report↗︎

brave-builds · 2024-03-07T14:23:14Z

A Storybook has been deployed to preview UI for the latest push

brave-builds · 2024-03-07T15:13:30Z

A Storybook has been deployed to preview UI for the latest push

rillian · 2024-03-07T17:25:39Z

script/brave_license_helper.py

+        # These have auto-generated license files and
+        # GetThirdPartyDepsFromGNDepsOutput causes strange license errors
+        # unless the this entire directory is excluded.
+        os.path.join('brave', 'third_party', 'rust'),


I think this can just exclude //brave/third_party/rust/chromium_crates_io/vendor.

please see the comment explaining why the entire directory is excluded

I read the comment, but I couldn't reproduce the errors. I suppose it doesn't matter much, but the narrower scope seemed a safer hack.

I can try it again, but it failed with a very strange error before

brave-builds · 2024-03-07T19:18:20Z

A Storybook has been deployed to preview UI for the latest push

rillian · 2024-03-07T21:51:07Z

NB you can address the audit failure by applying this patch to lol_html-0.3.1.

brave-builds · 2024-03-07T22:08:05Z

A Storybook has been deployed to preview UI for the latest push

brave-builds · 2024-03-07T23:55:25Z

A Storybook has been deployed to preview UI for the latest push

brave-builds · 2024-03-09T22:22:25Z

A Storybook has been deployed to preview UI for the latest push

brave-builds · 2024-03-09T23:20:29Z

A Storybook has been deployed to preview UI for the latest push

bridiver · 2024-03-10T20:53:57Z

third_party/rust/curve25519_dalek/v3/BUILD.gn

  ]
  features = [
    "alloc",
-    "serde",


double-checked this removal and it appears to be correct. This appears to only be enabled on v4

rillian · 2024-03-11T17:47:17Z

third_party/rust/adblock/v0_8/BUILD.gn

  build_native_rust_unit_tests = false
  edition = "2021"
  cargo_pkg_version = "0.8.8"
-  cargo_pkg_authors =
-      "Andrius Aucinas <aaucinas@brave.com>, Anton Lazarev <alazarev@brave.com>"
+  cargo_pkg_authors = "Anton Lazarev <alazarev@brave.com>, Andrius Aucinas"


Is removing Andrius' email here a bug?

seems like maybe a gnrt bug? This was auto-generated

rillian

Works for me. We have some nits, and should figure out how to manage the cargo vet config four our own purposes, but I'd prefer to see that in a followup, since this will unblock other contributions involving rust code.

@fmarier are you ok with the license helper exemption until we can figure out how to tell it where the actual license files are?

fmarier

Licensing exception is okay, but it needs a follow-up issue to be filed so that we don't forget to figure out how to do this properly once the dust has settled.

bridiver · 2024-03-12T16:07:09Z

linux arm64 failure is unrelated to this PR. See #21443

yrliou

wallet++

bridiver · 2024-03-12T17:31:59Z

patches/tools-crates-gnrt-gen.rs.patch

@@ -0,0 +1,12 @@
+diff --git a/tools/crates/gnrt/gen.rs b/tools/crates/gnrt/gen.rs


at least some of these patches can go to upstream, we'll figure out the details in a follow-up

mkarolin

patches and DEPS ++

bridiver · 2024-03-12T18:12:22Z

There are no substantive changes here for p3a so I'm going to go ahead and merge

github-actions bot assigned bridiver Jan 26, 2024

github-actions bot added the CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) label Jan 26, 2024

rillian mentioned this pull request Jan 30, 2024

Remove obsolete strobe_rng code #21816

Closed

24 tasks

bridiver force-pushed the rust-chromium-crates-io branch from 2866cb0 to 9e497d3 Compare January 30, 2024 17:28

rillian mentioned this pull request Jan 30, 2024

kuchikiki version inconsistencies brave/brave-browser#35708

Closed

bridiver force-pushed the rust-chromium-crates-io branch from fce9a28 to cde3a6e Compare March 6, 2024 22:35

github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels Mar 6, 2024

rillian reviewed Mar 7, 2024

View reviewed changes

bridiver force-pushed the rust-chromium-crates-io branch from a8e5906 to 95d2ece Compare March 7, 2024 21:23

bridiver added the CI/run-windows-x86 Run CI builds for Windows x86 label Mar 7, 2024

bridiver added CI/run-linux-arm64 Run CI builds for Linux arm64 CI/run-windows-arm64 Run CI builds for Windows arm64 labels Mar 7, 2024

bridiver force-pushed the rust-chromium-crates-io branch from 95d2ece to b3a7fc6 Compare March 7, 2024 23:09

bridiver force-pushed the rust-chromium-crates-io branch from b3a7fc6 to fdcdcdf Compare March 8, 2024 17:23

bridiver changed the base branch from master to cr123 March 8, 2024 17:24

bridiver force-pushed the rust-chromium-crates-io branch from fdcdcdf to 83a570d Compare March 8, 2024 17:26

Base automatically changed from cr123 to master March 9, 2024 00:18

bridiver marked this pull request as ready for review March 9, 2024 14:24

bridiver requested review from a team and fmarier as code owners March 9, 2024 14:24

bridiver force-pushed the rust-chromium-crates-io branch from c240962 to 9a0ea5a Compare March 9, 2024 21:35

bridiver added 2 commits March 9, 2024 15:39

move vendored crates to chromium_crates_io/vendor

c49ff98

fix gnrt

a3d081a

bridiver force-pushed the rust-chromium-crates-io branch from 9a0ea5a to a3d081a Compare March 9, 2024 22:42

bridiver requested a review from a team as a code owner March 9, 2024 22:42

bridiver commented Mar 10, 2024

View reviewed changes

rillian reviewed Mar 11, 2024

View reviewed changes

rillian approved these changes Mar 11, 2024

View reviewed changes

fmarier approved these changes Mar 11, 2024

View reviewed changes

rillian mentioned this pull request Mar 11, 2024

Update brave license helper for new rust vendor location brave/brave-browser#36707

Open

yrliou approved these changes Mar 12, 2024

View reviewed changes

bridiver commented Mar 12, 2024

View reviewed changes

mkarolin approved these changes Mar 12, 2024

View reviewed changes

bridiver merged commit afb81b3 into master Mar 12, 2024
18 of 19 checks passed

bridiver deleted the rust-chromium-crates-io branch March 12, 2024 18:16

github-actions bot added this to the 1.65.x - Nightly milestone Mar 12, 2024

rillian mentioned this pull request Mar 12, 2024

Revert "[Speedreader] Update to kuchikiki 0.8.2" #21832

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

move rust crates to chromium_crate_io #21759

move rust crates to chromium_crate_io #21759

bridiver commented Jan 26, 2024 •

edited

rillian commented Jan 29, 2024

bridiver commented Feb 1, 2024

bridiver commented Feb 1, 2024

bridiver commented Feb 1, 2024

brave-builds commented Mar 6, 2024

socket-security bot commented Mar 7, 2024 •

edited

brave-builds commented Mar 7, 2024

brave-builds commented Mar 7, 2024

rillian Mar 7, 2024

bridiver Mar 7, 2024

rillian Mar 7, 2024

bridiver Mar 7, 2024

brave-builds commented Mar 7, 2024

rillian commented Mar 7, 2024

brave-builds commented Mar 7, 2024

brave-builds commented Mar 7, 2024

brave-builds commented Mar 9, 2024

brave-builds commented Mar 9, 2024

bridiver Mar 10, 2024

rillian Mar 11, 2024

bridiver Mar 11, 2024

rillian left a comment •

edited

fmarier left a comment

bridiver commented Mar 12, 2024

yrliou left a comment

bridiver Mar 12, 2024

mkarolin left a comment

bridiver commented Mar 12, 2024

		@@ -0,0 +1,12 @@
		diff --git a/tools/crates/gnrt/gen.rs b/tools/crates/gnrt/gen.rs

move rust crates to chromium_crate_io #21759

move rust crates to chromium_crate_io #21759

Conversation

bridiver commented Jan 26, 2024 • edited

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

rillian commented Jan 29, 2024

bridiver commented Feb 1, 2024

bridiver commented Feb 1, 2024

bridiver commented Feb 1, 2024

brave-builds commented Mar 6, 2024

socket-security bot commented Mar 7, 2024 • edited

brave-builds commented Mar 7, 2024

brave-builds commented Mar 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brave-builds commented Mar 7, 2024

rillian commented Mar 7, 2024

brave-builds commented Mar 7, 2024

brave-builds commented Mar 7, 2024

brave-builds commented Mar 9, 2024

brave-builds commented Mar 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rillian left a comment • edited

Choose a reason for hiding this comment

fmarier left a comment

Choose a reason for hiding this comment

bridiver commented Mar 12, 2024

yrliou left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkarolin left a comment

Choose a reason for hiding this comment

bridiver commented Mar 12, 2024

bridiver commented Jan 26, 2024 •

edited

socket-security bot commented Mar 7, 2024 •

edited

rillian left a comment •

edited