---

yaml
---
r: 136541
b: refs/heads/dist-snap
c: 50d179d
h: refs/heads/master
i:
  136539: cf2ce62
v: v3

Author: gamazeps

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 189b7332968972f34cdbbbd9b62d97ababf53059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 6a37692ecbb88cd9c3ae06a7ae9d619aa535719d
+refs/heads/dist-snap: 50d179d0016ea5f3a3c820a45cdaa6921f9fb14c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustrt/c_str.rs

@@ -38,8 +38,9 @@ unnecessary amounts of allocations.
 
 Be carefull to remember that the memory is managed by C allocator API and not
 by Rust allocator API.
-That means that the CString pointers should only be freed with C allocator API
-if you intend to do that on your own.
+That means that the CString pointers should be freed with C allocator API
+if you intend to do that on your own, as the behaviour if you free them with
+Rust's allocator API is not well defined
 
 An example of creating and using a C string would be:
 
@@ -137,8 +138,8 @@ impl<S: hash::Writer> hash::Hash<S> for CString {
 
 impl CString {
     /// Create a C String from a pointer, with memory managed by C's allocator
-    /// API, so do not call it with a pointer to memory managed by Rust's
-    /// allocator API.
+    /// API, so avoid calling it with a pointer to memory managed by Rust's
+    /// allocator API, as the behaviour would not be well defined.
     ///
     ///# Failure
     ///
@@ -272,7 +273,7 @@ impl CString {
     /// forgotten, meaning that the backing allocation of this
     /// `CString` is not automatically freed if it owns the
     /// allocation. In this case, a user of `.unwrap()` should ensure
-    /// the allocation is freed, to avoid leaking memory. You have to
+    /// the allocation is freed, to avoid leaking memory. You should
     /// use libc's memory allocator in this case.
     ///
     /// Prefer `.as_ptr()` when just retrieving a pointer to the