-
Notifications
You must be signed in to change notification settings - Fork 872
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 filecoin-cxx
deps, mainly multihash
#25553
Conversation
b21cda4
to
074f01c
Compare
4dfdc0b
to
34ddfef
Compare
34ddfef
to
21f967f
Compare
@@ -280,7 +280,7 @@ extra_build_script_src_roots = [ "entities.rs" ] | |||
build_script_outputs = [ "generated.rs", "named_entities.rs", ] | |||
|
|||
[crate.multihash] | |||
extra_kv = { rustenv = [ "CARGO_MANIFEST_DIR=\" + rebase_path(\"//brave/third_party/rust/chromium_crates_io/vendor/multihash-0.16.3\") + \"" ]} | |||
extra_kv = { rustenv = [ "CARGO_MANIFEST_DIR=\" + rebase_path(\"//brave/third_party/rust/chromium_crates_io/vendor/multihash-0.18.1\") + \"" ]} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure we still need this, looks like it's added in run_build_script.py now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing this line seems to trigger the following failure
error: `CARGO_MANIFEST_DIR` env variable not set.
--> ../../brave/third_party/rust/chromium_crates_io/vendor/multihash-0.18.1/src/multihash_impl.rs:11:34
|
11 | #[derive(Copy, Clone, Debug, Eq, Multihash, PartialEq)]
| ^^^^^^^^^ in this derive macro expansion
--> ./../../brave/third_party/rust/chromium_crates_io/vendor/synstructure-0.12.6/src/macros.rs:94:9
::: ./../../brave/third_party/rust/chromium_crates_io/vendor/synstructure-0.12.6/src/macros.rs:96:40
|
= note: in this expansion of `#[derive(Multihash)]`
error: aborting due to 1 previous error
I'm not quite sure why run_build_script.py
is failing to set CARGO_MANIFEST_DIR
for multihash
in particular, but this failure seems to be the reason this line has been here in the first place.
509136c
to
8f8d866
Compare
5eacdc1
to
ce22cd8
Compare
This change is a first pass in getting the dependecies for `filecoin-cxx` updated, to eventually be able to drop the unmaintained crate `proc-macro-error`. This change updates `multihash` to `v0.16.3`->`v0.18.1`. In a follow up PR, the goal will be to deploy `v0.19.1`, which drops the unwanted crate as a transient dependency.
ce22cd8
to
a1db616
Compare
This change is a first pass in getting the dependecies for
filecoin-cxx
updated, to eventually be able to drop the unmaintained crateproc-macro-error
.This change updates
multihash
tov0.16.3
->v0.18.1
. In a follow up PR, the goal will be to deployv0.19.1
, which drops the unwanted crate as a transient dependency.Resolves brave/brave-browser#40947
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
wikinpm run presubmit
wiki,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan: