about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-08-28 08:57:37 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-08-31 07:02:50 -0700
commit7a2a8d7d60aa9f12dc44f51e1324573e1bd6f9b2 (patch)
tree02f78dfb172fc3311dde96bdeffafc92cc897950 /src/libstd/lib.rs
parent9b9de27101b751415dc6216e51ad4d4d219f6538 (diff)
downloadrust-7a2a8d7d60aa9f12dc44f51e1324573e1bd6f9b2.tar.gz
rust-7a2a8d7d60aa9f12dc44f51e1324573e1bd6f9b2.zip
Update Cargo to 0.23.0 and our lockfile
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index d149e1e9925..9d17e142f6c 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -320,6 +320,8 @@
 // Always use alloc_system during stage0 since we don't know if the alloc_*
 // crate the stage0 compiler will pick by default is enabled (e.g.
 // if the user has disabled jemalloc in `./configure`).
+// `force_alloc_system` is *only* intended as a workaround for local rebuilds
+// with a rustc without jemalloc.
 #![cfg_attr(any(stage0, feature = "force_alloc_system"),
             feature(global_allocator))]
 #[cfg(any(stage0, feature = "force_alloc_system"))]