about summary refs log tree commit diff
path: root/src/libstd/sys/wasm
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-09 04:22:50 +0000
committerbors <bors@rust-lang.org>2018-01-09 04:22:50 +0000
commit74966b5cb84934737d21bd9001db07bd93fa5d64 (patch)
tree91adae4383a3e9a5dcbd68543a78ef9adcda5b29 /src/libstd/sys/wasm
parentb5392f54503fdaf04df4b9578510b2baa944f4af (diff)
parent9ef98545c9d55e109242b6b3489060ebc690ab05 (diff)
downloadrust-74966b5cb84934737d21bd9001db07bd93fa5d64.tar.gz
rust-74966b5cb84934737d21bd9001db07bd93fa5d64.zip
Auto merge of #47276 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests

- Successful merges: #47210, #47233, #47246, #47254, #47256, #47258, #47259, #47263, #47270, #47272
- Failed merges: #47248
Diffstat (limited to 'src/libstd/sys/wasm')
-rw-r--r--src/libstd/sys/wasm/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/wasm/mod.rs b/src/libstd/sys/wasm/mod.rs
index b838dbafd6f..ba3d6a2813a 100644
--- a/src/libstd/sys/wasm/mod.rs
+++ b/src/libstd/sys/wasm/mod.rs
@@ -39,6 +39,7 @@ use os::raw::c_char;
 const DEBUG: bool = false;
 
 pub mod args;
+#[cfg(feature = "backtrace")]
 pub mod backtrace;
 pub mod cmath;
 pub mod condvar;