about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-02 11:24:13 +0000
committerbors <bors@rust-lang.org>2019-08-02 11:24:13 +0000
commit1df512fcaeaf17639c5d28a3045814d6f7a7db97 (patch)
tree9b6c5c48d0e809e70979f5dcf9995282afbc5fde /src/libstd
parentfc3ef9698fa80aa2f4da6208b8295bc8fa48eec5 (diff)
parent97098f466ad7a72e6690cf45e6ff2d60885396a9 (diff)
downloadrust-1df512fcaeaf17639c5d28a3045814d6f7a7db97.tar.gz
rust-1df512fcaeaf17639c5d28a3045814d6f7a7db97.zip
Auto merge of #63214 - Centril:rollup-hdb7dnx, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #62663 (More questionmarks in doctests)
 - #62969 (Changing the structure of `mir::interpret::InterpError`)
 - #63153 (Remove redundant method with const variable resolution)
 - #63189 (Doc improvements)
 - #63198 (Allow trailing comma in macro 2.0 declarations.)
 - #63202 (Fix ICE in #63135)
 - #63203 (Make is_mutable use PlaceRef instead of it's fields)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ffi/c_str.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 585731fb30e..6e111f24236 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -1055,7 +1055,7 @@ impl CStr {
     ///
     /// ```no_run
     /// # #![allow(unused_must_use)]
-    /// use std::ffi::{CString};
+    /// use std::ffi::CString;
     ///
     /// let ptr = CString::new("Hello").expect("CString::new failed").as_ptr();
     /// unsafe {
@@ -1071,7 +1071,7 @@ impl CStr {
     ///
     /// ```no_run
     /// # #![allow(unused_must_use)]
-    /// use std::ffi::{CString};
+    /// use std::ffi::CString;
     ///
     /// let hello = CString::new("Hello").expect("CString::new failed");
     /// let ptr = hello.as_ptr();