about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-19 10:52:19 +0000
committerbors <bors@rust-lang.org>2020-11-19 10:52:19 +0000
commit7e2032390cf34f3ffa726b7bd890141e2684ba63 (patch)
treef2e6c04b7949c76b33641aa7dac354f4b82f5dcb /src
parent5a549d36ee81b226d16724240b88f0137f8a36af (diff)
parentb03d4b0ee93599e02673f5fdd6323734485ca25a (diff)
downloadrust-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.
Diffstat (limited to 'src')
-rw-r--r--src/stage0.txt2
1 files changed, 1 insertions, 1 deletions
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:
 #