diff options
| author | bors <bors@rust-lang.org> | 2020-11-19 10:52:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-19 10:52:19 +0000 |
| commit | 7e2032390cf34f3ffa726b7bd890141e2684ba63 (patch) | |
| tree | f2e6c04b7949c76b33641aa7dac354f4b82f5dcb | |
| parent | 5a549d36ee81b226d16724240b88f0137f8a36af (diff) | |
| parent | b03d4b0ee93599e02673f5fdd6323734485ca25a (diff) | |
| download | rust-7e2032390cf34f3ffa726b7bd890141e2684ba63.tar.gz rust-7e2032390cf34f3ffa726b7bd890141e2684ba63.zip | |
Auto merge of #78449 - Aaron1011:fix/libstd-semi, r=dtolnay
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.
| -rw-r--r-- | library/core/src/str/validations.rs | 2 | ||||
| -rw-r--r-- | src/stage0.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/core/src/str/validations.rs b/library/core/src/str/validations.rs index 10cf1e172e6..373a8212425 100644 --- 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 index dae9d219b7b..5b04e0a4985 100644 --- 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: # |