about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-31 08:26:30 +0000
committerbors <bors@rust-lang.org>2014-08-31 08:26:30 +0000
commitdb47aa5bdf308213b4198b81e9d2e406ec716189 (patch)
tree4657767a7108317107eaf5789017729157449b41 /src/liballoc
parent499a40e59f62f6e860eb201d91f9ba9cecb99d35 (diff)
parent33029c5ddd255725f9ae701dec0a571256f8856c (diff)
downloadrust-db47aa5bdf308213b4198b81e9d2e406ec716189.tar.gz
rust-db47aa5bdf308213b4198b81e9d2e406ec716189.zip
auto merge of #16895 : alexcrichton/rust/rollup, r=alexcrichton
Let's try this again!
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index cacb9e28989..503c484e469 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -12,7 +12,7 @@
 //!
 //! This is the lowest level library through which allocation in Rust can be
 //! performed where the allocation is assumed to succeed. This library will
-//! trigger a task failure when allocation fails.
+//! abort the process when allocation fails.
 //!
 //! This library, like libcore, is not intended for general usage, but rather as
 //! a building block of other libraries. The types and interfaces in this