Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 8d6f407

Browse files
committed
1 parent 22514cc commit 8d6f407

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ repository and compiled from source or installed from
2727
of the nightly toolchain is supported at any given time.
2828

2929
<!-- NOTE: Keep in sync with nightly date on rust-toolchain. -->
30-
It's recommended to use `nightly-2021-10-25` toolchain.
31-
You can install it by using `rustup install nightly-2021-10-25` if you already have rustup.
30+
It's recommended to use `nightly-2021-11-15` toolchain.
31+
You can install it by using `rustup install nightly-2021-11-15` if you already have rustup.
3232
Then you can do:
3333

3434
```sh
35-
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-10-25
36-
$ cargo +nightly-2021-10-25 install --git https://github.com/rust-lang/rust-semverver
35+
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-11-15
36+
$ cargo +nightly-2021-11-15 install --git https://github.com/rust-lang/rust-semverver
3737
```
3838

3939
You'd also need `cmake` for some dependencies, and a few common libraries (if you hit

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# NOTE: Keep in sync with nightly date on README
22
[toolchain]
3-
channel = "nightly-2021-10-25"
3+
channel = "nightly-2021-11-15"
44
components = ["llvm-tools-preview", "rustc-dev"]

src/mapping.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ impl NameMapping {
374374
Use |
375375
ForeignMod |
376376
AnonConst |
377+
InlineConst |
377378
Field |
378379
LifetimeParam |
379380
GlobalAsm |

src/typeck.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ impl<'a, 'tcx> BoundContext<'a, 'tcx> {
8888

8989
/// Return inference errors, if any.
9090
pub fn get_errors(&mut self) -> Option<Vec<FulfillmentError<'tcx>>> {
91-
if let Err(err) = self.fulfill_cx.select_all_or_error(self.infcx) {
92-
debug!("err: {:?}", err);
93-
Some(err)
91+
let errors = self.fulfill_cx.select_all_or_error(self.infcx);
92+
if !errors.is_empty() {
93+
debug!("err: {:?}", errors);
94+
Some(errors)
9495
} else {
9596
None
9697
}

0 commit comments

Comments
 (0)