diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-30 08:39:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-30 08:39:57 -0400 |
| commit | 262b0fe7a00f9f13980c408b975f08fcdc8ec117 (patch) | |
| tree | 9d6473f60860534d50d513e52482464fa204b198 /src/rust/external | |
| parent | 709cd447f0b207f969d448bd4fe2d5f2795e678d (diff) | |
| parent | 82857849662189d25e1a06bf6b764c64d2468168 (diff) | |
| download | tor-262b0fe7a00f9f13980c408b975f08fcdc8ec117.tar.gz tor-262b0fe7a00f9f13980c408b975f08fcdc8ec117.zip | |
Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5
Diffstat (limited to 'src/rust/external')
| -rw-r--r-- | src/rust/external/Cargo.toml | 6 | ||||
| -rw-r--r-- | src/rust/external/lib.rs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/rust/external/Cargo.toml b/src/rust/external/Cargo.toml index 4735144ee6..5f443645bb 100644 --- a/src/rust/external/Cargo.toml +++ b/src/rust/external/Cargo.toml @@ -5,14 +5,12 @@ name = "external" [dependencies] libc = "=0.2.39" - -[dependencies.smartlist] -path = "../smartlist" +smartlist = { path = "../smartlist" } +tor_allocate = { path = "../tor_allocate" } [lib] name = "external" path = "lib.rs" -crate_type = ["rlib", "staticlib"] [features] # We have to define a feature here because doctests don't get cfg(test), diff --git a/src/rust/external/lib.rs b/src/rust/external/lib.rs index b72a4f6e4c..d68036fcad 100644 --- a/src/rust/external/lib.rs +++ b/src/rust/external/lib.rs @@ -8,7 +8,7 @@ //! module implementing this functionality repeatedly. extern crate libc; - +extern crate tor_allocate; extern crate smartlist; pub mod crypto_digest; |