From 38d644c94bf1a42fcec40843e817c460e9e752de Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 1 Oct 2018 22:58:44 -0700
Subject: [PATCH] Remove rlib+staticlib configuration for Rust crates

Only the final crate needs to be a `staticlib`, no need for all the
intermediate steps to produce staticlibs!
---
 src/rust/crypto/Cargo.toml       | 1 -
 src/rust/external/Cargo.toml     | 1 -
 src/rust/protover/Cargo.toml     | 1 -
 src/rust/smartlist/Cargo.toml    | 1 -
 src/rust/tor_allocate/Cargo.toml | 1 -
 src/rust/tor_log/Cargo.toml      | 1 -
 src/rust/tor_rust/Cargo.toml     | 2 +-
 src/rust/tor_util/Cargo.toml     | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml
index 6ebfe0dc11..a7ff7f78d9 100644
--- a/src/rust/crypto/Cargo.toml
+++ b/src/rust/crypto/Cargo.toml
@@ -9,7 +9,6 @@ build = "../build.rs"
 [lib]
 name = "crypto"
 path = "lib.rs"
-crate_type = ["rlib", "staticlib"]
 
 [dependencies]
 libc = "=0.2.39"
diff --git a/src/rust/external/Cargo.toml b/src/rust/external/Cargo.toml
index d5c3a739e0..5f443645bb 100644
--- a/src/rust/external/Cargo.toml
+++ b/src/rust/external/Cargo.toml
@@ -11,7 +11,6 @@ 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/protover/Cargo.toml b/src/rust/protover/Cargo.toml
index 2f7783e76c..84a7c71c1a 100644
--- a/src/rust/protover/Cargo.toml
+++ b/src/rust/protover/Cargo.toml
@@ -31,4 +31,3 @@ path = "../tor_log"
 [lib]
 name = "protover"
 path = "lib.rs"
-crate_type = ["rlib", "staticlib"]
diff --git a/src/rust/smartlist/Cargo.toml b/src/rust/smartlist/Cargo.toml
index 4ecdf50869..a5afe7bf74 100644
--- a/src/rust/smartlist/Cargo.toml
+++ b/src/rust/smartlist/Cargo.toml
@@ -9,7 +9,6 @@ libc = "0.2.39"
 [lib]
 name = "smartlist"
 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/tor_allocate/Cargo.toml b/src/rust/tor_allocate/Cargo.toml
index 7bb3b9887f..06ac605f17 100644
--- a/src/rust/tor_allocate/Cargo.toml
+++ b/src/rust/tor_allocate/Cargo.toml
@@ -9,7 +9,6 @@ libc = "=0.2.39"
 [lib]
 name = "tor_allocate"
 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/tor_log/Cargo.toml b/src/rust/tor_log/Cargo.toml
index 1aa9be0612..14d9ae803a 100644
--- a/src/rust/tor_log/Cargo.toml
+++ b/src/rust/tor_log/Cargo.toml
@@ -6,7 +6,6 @@ authors = ["The Tor Project"]
 [lib]
 name = "tor_log"
 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/tor_rust/Cargo.toml b/src/rust/tor_rust/Cargo.toml
index 1523ee0dd1..35c629882e 100644
--- a/src/rust/tor_rust/Cargo.toml
+++ b/src/rust/tor_rust/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 [lib]
 name = "tor_rust"
 path = "lib.rs"
-crate_type = ["rlib", "staticlib"]
+crate_type = ["staticlib"]
 
 [dependencies.tor_util]
 path = "../tor_util"
diff --git a/src/rust/tor_util/Cargo.toml b/src/rust/tor_util/Cargo.toml
index 51e4bd9c5d..9ffaeda8a6 100644
--- a/src/rust/tor_util/Cargo.toml
+++ b/src/rust/tor_util/Cargo.toml
@@ -6,7 +6,6 @@ version = "0.0.1"
 [lib]
 name = "tor_util"
 path = "lib.rs"
-crate_type = ["rlib", "staticlib"]
 
 [dependencies.tor_allocate]
 path = "../tor_allocate"