about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-20 23:16:47 +0000
committerbors <bors@rust-lang.org>2015-03-20 23:16:47 +0000
commite2fa53e593a854a609ae9efe5a1bbe15265f0a6f (patch)
tree31d6cf6dcb795deb1b8bda95d58cfbf02002000b /src/libsyntax/ext
parent68d69415637186755482d2584e6ba82b67bc1d89 (diff)
parentb4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (diff)
downloadrust-e2fa53e593a854a609ae9efe5a1bbe15265f0a6f.tar.gz
rust-e2fa53e593a854a609ae9efe5a1bbe15265f0a6f.zip
Auto merge of #23512 - oli-obk:result_ok_unwrap, r=alexcrichton
because then the call to `unwrap()` will not print the error object.
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/deriving/encodable.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs
index d7961d7da00..06255f46779 100644
--- a/src/libsyntax/ext/deriving/encodable.rs
+++ b/src/libsyntax/ext/deriving/encodable.rs
@@ -64,7 +64,7 @@
 //!     fn encode(&self, s: &mut S) -> Result<(), E> {
 //!         s.emit_struct("Spanned", 2, |this| {
 //!             this.emit_struct_field("node", 0, |this| self.node.encode(this))
-//!                 .ok().unwrap();
+//!                 .unwrap();
 //!             this.emit_struct_field("span", 1, |this| self.span.encode(this))
 //!         })
 //!     }
@@ -79,9 +79,9 @@
 //!         d.read_struct("Spanned", 2, |this| {
 //!             Ok(Spanned {
 //!                 node: this.read_struct_field("node", 0, |this| Decodable::decode(this))
-//!                     .ok().unwrap(),
+//!                     .unwrap(),
 //!                 span: this.read_struct_field("span", 1, |this| Decodable::decode(this))
-//!                     .ok().unwrap(),
+//!                     .unwrap(),
 //!             })
 //!         })
 //!     }