Bump rustfmt to most recently shipped

7 files changed, 27 insertions, 18 deletions

diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs
index 37369289c51..bb68184c8dd 100644
--- a/src/libcore/iter/range.rs
+++ b/src/libcore/iter/range.rs
@@ -70,7 +70,7 @@ macro_rules! step_identical_methods {
         fn sub_one(&self) -> Self {
             Sub::sub(*self, 1)
         }
-    }
+    };
 }
 
 macro_rules! step_impl_unsigned {
diff --git a/src/libcore/macros/mod.rs b/src/libcore/macros/mod.rs
index f86eee788c0..85d848f54fb 100644
--- a/src/libcore/macros/mod.rs
+++ b/src/libcore/macros/mod.rs
@@ -336,7 +336,7 @@ macro_rules! r#try {
         }
     };
     ($expr:expr,) => {
-        $crate::try!($expr)
+        $crate::r#try!($expr)
     };
 }
 
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs
index 71df6e049e5..eb7677e9345 100644
--- a/src/libproc_macro/lib.rs
+++ b/src/libproc_macro/lib.rs
@@ -273,14 +273,14 @@ impl !Send for Span {}
 impl !Sync for Span {}
 
 macro_rules! diagnostic_method {
-    ($name:ident, $level:expr) => (
+    ($name:ident, $level:expr) => {
         /// Creates a new `Diagnostic` with the given `message` at the span
         /// `self`.
         #[unstable(feature = "proc_macro_diagnostic", issue = "54140")]
         pub fn $name<T: Into<String>>(self, message: T) -> Diagnostic {
             Diagnostic::spanned(self, $level, message)
         }
-    )
+    };
 }
 
 impl Span {
diff --git a/src/librustc_metadata/rmeta/table.rs b/src/librustc_metadata/rmeta/table.rs
index 752caff754e..bacb5a345fc 100644
--- a/src/librustc_metadata/rmeta/table.rs
+++ b/src/librustc_metadata/rmeta/table.rs
@@ -42,10 +42,7 @@ macro_rules! fixed_size_encoding_byte_len_and_defaults {
             // but slicing `[u8]` with `i * N..` is optimized worse, due to the
             // possibility of `i * N` overflowing, than indexing `[[u8; N]]`.
             let b = unsafe {
-                std::slice::from_raw_parts(
-                    b.as_ptr() as *const [u8; BYTE_LEN],
-                    b.len() / BYTE_LEN,
-                )
+                std::slice::from_raw_parts(b.as_ptr() as *const [u8; BYTE_LEN], b.len() / BYTE_LEN)
             };
             b.get(i).map(|b| FixedSizeEncoding::from_bytes(b))
         }
@@ -61,7 +58,7 @@ macro_rules! fixed_size_encoding_byte_len_and_defaults {
             };
             self.write_to_bytes(&mut b[i]);
         }
-    }
+    };
 }
 
 impl FixedSizeEncoding for u32 {
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index cacc28b6e60..7565bdeb409 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -2305,7 +2305,7 @@ macro_rules! read_primitive {
                 value => Err(ExpectedError("Number".to_owned(), value.to_string())),
             }
         }
-    }
+    };
 }
 
 impl crate::Decoder for Decoder {
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index 41bdfea53e5..5cd2a25b117 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -149,23 +149,35 @@ pub trait AsciiExt {
 macro_rules! delegating_ascii_methods {
     () => {
         #[inline]
-        fn is_ascii(&self) -> bool { self.is_ascii() }
+        fn is_ascii(&self) -> bool {
+            self.is_ascii()
+        }
 
         #[inline]
-        fn to_ascii_uppercase(&self) -> Self::Owned { self.to_ascii_uppercase() }
+        fn to_ascii_uppercase(&self) -> Self::Owned {
+            self.to_ascii_uppercase()
+        }
 
         #[inline]
-        fn to_ascii_lowercase(&self) -> Self::Owned { self.to_ascii_lowercase() }
+        fn to_ascii_lowercase(&self) -> Self::Owned {
+            self.to_ascii_lowercase()
+        }
 
         #[inline]
-        fn eq_ignore_ascii_case(&self, o: &Self) -> bool { self.eq_ignore_ascii_case(o) }
+        fn eq_ignore_ascii_case(&self, o: &Self) -> bool {
+            self.eq_ignore_ascii_case(o)
+        }
 
         #[inline]
-        fn make_ascii_uppercase(&mut self) { self.make_ascii_uppercase(); }
+        fn make_ascii_uppercase(&mut self) {
+            self.make_ascii_uppercase();
+        }
 
         #[inline]
-        fn make_ascii_lowercase(&mut self) { self.make_ascii_lowercase(); }
-    }
+        fn make_ascii_lowercase(&mut self) {
+            self.make_ascii_lowercase();
+        }
+    };
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/stage0.txt b/src/stage0.txt
index 537d9664b08..150d7a0943d 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -20,7 +20,7 @@ cargo: beta
 # bootstrapping issues with use of new syntax in this repo. If you're looking at
 # the beta/stable branch, this key should be omitted, as we don't want to depend
 # on rustfmt from nightly there.
-rustfmt: nightly-2020-01-31
+rustfmt: nightly-2020-04-22
 
 # When making a stable release the process currently looks like:
 #