Auto merge of #78449 - Aaron1011:fix/libstd-semi, r=dtolnay

bors · bors · commit 7e2032390cf3 · 2020-11-19T10:52:19.000Z
Remove semicolon from internal `err` macro This macro is used in expression position (a match arm), and only compiles because of #33953 Regardless of what happens with that issue, this makes the usage of the macro less confusing at the call site.
diff --git a/library/core/src/str/validations.rs b/library/core/src/str/validations.rs
@@ -125,7 +125,7 @@ pub(super) fn run_utf8_validation(v: &[u8]) -> Result<(), Utf8Error> {
         let old_offset = index;
         macro_rules! err {
             ($error_len: expr) => {
-                return Err(Utf8Error { valid_up_to: old_offset, error_len: $error_len });
+                return Err(Utf8Error { valid_up_to: old_offset, error_len: $error_len })
             };
         }
 
diff --git a/src/stage0.txt b/src/stage0.txt
@@ -19,7 +19,7 @@ rustc: 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-10-12
+rustfmt: nightly-2020-11-19
 
 # When making a stable release the process currently looks like:
 #

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ pub(super) fn run_utf8_validation(v: &[u8]) -> Result<(), Utf8Error> {`
`125`	`125`	`let old_offset = index;`
`126`	`126`	`macro_rules! err {`
`127`	`127`	`($error_len: expr) => {`
`128`		`- return Err(Utf8Error { valid_up_to: old_offset, error_len: $error_len });`
	`128`	`+ return Err(Utf8Error { valid_up_to: old_offset, error_len: $error_len })`
`129`	`129`	`};`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ rustc: beta`
`19`	`19`	`# bootstrapping issues with use of new syntax in this repo. If you're looking at`
`20`	`20`	`# the beta/stable branch, this key should be omitted, as we don't want to depend`
`21`	`21`	`# on rustfmt from nightly there.`
`22`		`-rustfmt: nightly-2020-10-12`
	`22`	`+rustfmt: nightly-2020-11-19`
`23`	`23`
`24`	`24`	`# When making a stable release the process currently looks like:`
`25`	`25`	`#`