Use Cargo to install rust deps into //third_party/rust_crates #383
Conversation
Cargo.toml
Outdated
| [dependencies] | ||
| url = {git = "https://github.com/servo/rust-url.git", rev = "fbe5e50316105482dcd53d2dabb148c445a5f4cd"} | ||
| libc = {git = "https://github.com/rust-lang/libc.git", rev = "8a85d662b90c14d458bc4ae9521a05564e20d7ae"} | ||
| log = {git = "https://github.com/rust-lang-nursery/log.git", rev = "7a6028666b6e21e8cd39203e1f1114afc44333ef"} |
There was a problem hiding this comment.
I’m fine with using normal versions instead of git + rev - I think that’s preferable ?
Cargo.toml
Outdated
| version = "0.0.0" | ||
|
|
||
| [lib] | ||
| path = "empty.rs" |
There was a problem hiding this comment.
Are all of the above lines necessary ?
Go ahead and use “deno” instead of “dummy” ... maybe add a comment here about how this is only used for dependency management and called from tools/build_third_party.py only when adding deps
There was a problem hiding this comment.
The [lib] stuff is not. Forgot to remove it when I was experimenting.
Will add the comment.
|
I added the RLS thing to .gitignore because RLS starts generating stuff when it detects Cargo.toml at the root of your project (in VSCode). |
tools/build_third_party.py
Outdated
| @@ -29,3 +29,4 @@ | |||
| remove_and_symlink(join("v8", "third_party", "markupsafe"), "markupsafe") | |||
| run(["gclient", "sync", "--shallow", "--no-history"]) | |||
| run(["yarn"]) | |||
| run(["cargo", "fetch", "--manifest-path=../Cargo.toml"], False, {'CARGO_HOME': os.getcwd() + '/rust_crates'}) | |||
There was a problem hiding this comment.
Rather than using cwd, use the root_path defined above
tools/build_third_party.py
Outdated
| @@ -29,3 +29,4 @@ | |||
| remove_and_symlink(join("v8", "third_party", "markupsafe"), "markupsafe") | |||
| run(["gclient", "sync", "--shallow", "--no-history"]) | |||
| run(["yarn"]) | |||
| run(["cargo", "fetch", "--manifest-path=../Cargo.toml"], False, {'CARGO_HOME': third_party_path + '/rust_crates'}) | |||
There was a problem hiding this comment.
Line is over 80 cols - run ./tools/format.py
tools/build_third_party.py
Outdated
| run(["cargo", "fetch", "--manifest-path=../Cargo.toml"], False, | ||
| {'CARGO_HOME': third_party_path + '/rust_crates'}) |
There was a problem hiding this comment.
Nit: you don't have to specify the quiet arg:
run(["cargo", "fetch", "--manifest-path=../Cargo.toml"], env={'CARGO_HOME': third_party_path + '/rust_crates'})
Addresses https://github.com/ry/deno/issues/366