---

yaml
---
r: 275151
b: refs/heads/stable
c: 16f218b
h: refs/heads/master
i:
  275149: f64837a
  275147: 8dddccc
  275143: 3e775be
  275135: 8982ae9

Author: arcnmx

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: a70ae2ffb9a5dd08d916b9938eeca820486ba7a0
+refs/heads/stable: 16f218b6006faa752925ca5934372c34f1eb2953
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libstd/ffi/c_str.rs

@@ -449,16 +449,16 @@ impl CStr {
     /// use std::ffi::CStr;
     ///
     /// # fn main() {
-    /// let cstr = CStr::from_bytes(b"hello\0");
+    /// let cstr = CStr::from_bytes_with_nul(b"hello\0");
     /// assert!(cstr.is_some());
     /// # }
     /// ```
     #[unstable(feature = "cstr_from_bytes", reason = "recently added", issue = "0")]
-    pub fn from_bytes<'a>(bytes: &'a [u8]) -> Option<&'a CStr> {
+    pub fn from_bytes_with_nul<'a>(bytes: &'a [u8]) -> Option<&'a CStr> {
         if bytes.is_empty() || memchr::memchr(0, &bytes) != Some(bytes.len() - 1) {
             None
         } else {
-            Some(unsafe { Self::from_bytes_unchecked(bytes) })
+            Some(unsafe { Self::from_bytes_with_nul_unchecked(bytes) })
         }
     }
 
@@ -477,13 +477,13 @@ impl CStr {
     /// # fn main() {
     /// unsafe {
     ///     let cstring = CString::new("hello").unwrap();
-    ///     let cstr = CStr::from_bytes_unchecked(cstring.to_bytes_with_nul());
+    ///     let cstr = CStr::from_bytes_with_nul_unchecked(cstring.to_bytes_with_nul());
     ///     assert_eq!(cstr, &*cstring);
     /// }
     /// # }
     /// ```
     #[unstable(feature = "cstr_from_bytes", reason = "recently added", issue = "0")]
-    pub unsafe fn from_bytes_unchecked<'a>(bytes: &'a [u8]) -> &'a CStr {
+    pub unsafe fn from_bytes_with_nul_unchecked<'a>(bytes: &'a [u8]) -> &'a CStr {
         mem::transmute(bytes)
     }