about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-12-03 18:07:15 +0800
committerGitHub <noreply@github.com>2018-12-03 18:07:15 +0800
commitca98bce303a2ed8f9b21eb6d2e602e76a7c00754 (patch)
tree9a38c8fa276be6a7618fbc012a0f09bd2ba0ad4f /src/libcore
parent71d76bec1e162c90def081494add1150f47e598c (diff)
parente7e96921c28ab8d29b6ee61053152eead822f09a (diff)
downloadrust-ca98bce303a2ed8f9b21eb6d2e602e76a7c00754.tar.gz
rust-ca98bce303a2ed8f9b21eb6d2e602e76a7c00754.zip
Rollup merge of #56419 - mark-i-m:remove-try, r=Centril
Remove some uses of try!
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/macros.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs
index c008b78e450..8b1855800c2 100644
--- a/src/libcore/macros.rs
+++ b/src/libcore/macros.rs
@@ -278,14 +278,14 @@ macro_rules! debug_assert_ne {
 ///
 /// // The previous method of quick returning Errors
 /// fn write_to_file_using_try() -> Result<(), MyError> {
-///     let mut file = try!(File::create("my_best_friends.txt"));
-///     try!(file.write_all(b"This is a list of my best friends."));
+///     let mut file = r#try!(File::create("my_best_friends.txt"));
+///     r#try!(file.write_all(b"This is a list of my best friends."));
 ///     Ok(())
 /// }
 ///
 /// // This is equivalent to:
 /// fn write_to_file_using_match() -> Result<(), MyError> {
-///     let mut file = try!(File::create("my_best_friends.txt"));
+///     let mut file = r#try!(File::create("my_best_friends.txt"));
 ///     match file.write_all(b"This is a list of my best friends.") {
 ///         Ok(v) => v,
 ///         Err(e) => return Err(From::from(e)),
@@ -296,14 +296,14 @@ macro_rules! debug_assert_ne {
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(alias = "?")]
-macro_rules! try {
+macro_rules! r#try {
     ($expr:expr) => (match $expr {
         $crate::result::Result::Ok(val) => val,
         $crate::result::Result::Err(err) => {
             return $crate::result::Result::Err($crate::convert::From::from(err))
         }
     });
-    ($expr:expr,) => (try!($expr));
+    ($expr:expr,) => (r#try!($expr));
 }
 
 /// Write formatted data into a buffer.