mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
bors 2020-11-19 10:52:19 +00:00
commit 7e2032390c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/core/src/str/validations.rs
View File

@ -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 })
};
}

2
src/stage0.txt
View File

@ -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:
#