summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-01-23 09:38:41 -0500
committerSteve Klabnik <steve@steveklabnik.com>2016-01-23 09:38:41 -0500
commit03b4bf20f6fa922d7a1cfa5d270ce763ceca09bf (patch)
treed3d69a511a81ce03822eb6c26c69a63aa49aa9b2 /src/libstd
parente598b43243528c49ff6b1dd5350994fe971e941d (diff)
parent6849b6dc95266df9dbe6e1fc33c27c6b4dc08c13 (diff)
downloadrust-03b4bf20f6fa922d7a1cfa5d270ce763ceca09bf.tar.gz
rust-03b4bf20f6fa922d7a1cfa5d270ce763ceca09bf.zip
Rollup merge of #31019 - andreabedini:patch-1, r=alexcrichton
Documentation of `CStr::from_ptr` suggests using `str::from_utf8(slice.to_bytes()).unwrap()`
to obtain a `&str` but `CStr` has `CStr::to_str` that does exactly that.

(First PR, be nice :)
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ffi/c_str.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index d6aa746f4cb..9d505607a60 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -407,7 +407,6 @@ impl CStr {
     /// # fn main() {
     /// use std::ffi::CStr;
     /// use std::os::raw::c_char;
-    /// use std::str;
     ///
     /// extern {
     ///     fn my_string() -> *const c_char;
@@ -415,8 +414,7 @@ impl CStr {
     ///
     /// unsafe {
     ///     let slice = CStr::from_ptr(my_string());
-    ///     println!("string returned: {}",
-    ///              str::from_utf8(slice.to_bytes()).unwrap());
+    ///     println!("string returned: {}", slice.to_str().unwrap());
     /// }
     /// # }
     /// ```