[tor-commits] [tor/master] Don't pass --quiet to cargo for now

[nickm at torproject.org]

commit 0694a6dc01b725560f7d1706b1803faf91d62c8b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 4 14:19:22 2017 -0500

    Don't pass --quiet to cargo for now
    
    Fixes bug 24518.
---
 changes/ticket24518          | 4 ++++
 src/rust/tor_rust/include.am | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/ticket24518 b/changes/ticket24518
new file mode 100644
index 000000000..28d40a3f2
--- /dev/null
+++ b/changes/ticket24518
@@ -0,0 +1,4 @@
+  o Minor bugfixes (build, rust):
+    - Don't pass the --quiet option to cargo: it seems to suppress some
+      errors, which is not what we want to do when building.
+      Fixes bug 24518; bugfix on 0.3.1.7.
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am
index 90f37a9f1..79361c33c 100644
--- a/src/rust/tor_rust/include.am
+++ b/src/rust/tor_rust/include.am
@@ -2,17 +2,19 @@ EXTRA_DIST +=\
 	src/rust/tor_rust/Cargo.toml \
 	src/rust/tor_rust/lib.rs
 
+EXTRA_CARGO_OPTIONS=
+
 src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE
 	( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
 		CARGO_HOME="$(abs_top_builddir)/src/rust" \
-		$(CARGO) build --release --quiet $(CARGO_ONLINE) )
+		$(CARGO) build --release $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) )
 
 distclean-rust:
 	( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
 		CARGO_HOME="$(abs_top_builddir)/src/rust" \
-		$(CARGO) clean --quiet $(CARGO_ONLINE) )
+		$(CARGO) clean $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) )
 	rm -rf "$(abs_top_builddir)/src/rust/registry"
 
 if USE_RUST