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

Commit

Permalink
Auto merge of #319 - JohnTitor:rustup-2022-06-15, r=JohnTitor
Browse files Browse the repository at this point in the history
Rustup to rust-lang/rust#98041

Fixes #318

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
  • Loading branch information
bors committed Jun 15, 2022
2 parents 127312f + b0ba377 commit 57a6b00
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -27,13 +27,13 @@ repository and compiled from source or installed from
of the nightly toolchain is supported at any given time.

<!-- NOTE: Keep in sync with nightly date on rust-toolchain. -->
It's recommended to use `nightly-2022-06-09` toolchain.
You can install it by using `rustup install nightly-2022-06-09` if you already have rustup.
It's recommended to use `nightly-2022-06-15` toolchain.
You can install it by using `rustup install nightly-2022-06-15` if you already have rustup.
Then you can do:

```sh
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-06-09
$ cargo +nightly-2022-06-09 install --git https://github.com/rust-lang/rust-semverver
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-06-15
$ cargo +nightly-2022-06-15 install --git https://github.com/rust-lang/rust-semverver
```

You'd also need `cmake` for some dependencies, and a few common libraries (if you hit
Expand Down Expand Up @@ -122,7 +122,7 @@ carried out correctly with regards to the current version of your crate on crate

```sh
# install a current version of rust-semverver
cargo +nightly-2022-06-09 install --git https://github.com/rust-lang/rust-semverver
cargo +nightly-2022-06-15 install --git https://github.com/rust-lang/rust-semverver
# fetch the version in the manifest of your crate (adapt this to your usecase if needed)
eval "current_version=$(grep -e '^version = .*$' Cargo.toml | cut -d ' ' -f 3)"
# run the semver checks and output them for convenience
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1,4 +1,4 @@
# NOTE: Keep in sync with nightly date on README
[toolchain]
channel = "nightly-2022-06-09"
channel = "nightly-2022-06-15"
components = ["llvm-tools-preview", "rustc-dev"]
9 changes: 3 additions & 6 deletions src/typeck.rs
Expand Up @@ -218,7 +218,7 @@ impl<'a, 'tcx> TypeComparisonContext<'a, 'tcx> {
target: Ty<'tcx>,
) -> Option<TypeError<'tcx2>> {
use rustc_infer::infer::outlives::env::OutlivesEnvironment;
use rustc_infer::infer::{InferOk, RegionckMode};
use rustc_infer::infer::InferOk;
use rustc_middle::ty::Lift;

let error = self.infcx.commit_if_ok(|snapshot| {
Expand Down Expand Up @@ -248,11 +248,8 @@ impl<'a, 'tcx> TypeComparisonContext<'a, 'tcx> {
// self.relate_regions(r_b, r_a);
// }

self.infcx.resolve_regions_and_report_errors(
target_def_id,
&outlives_env,
RegionckMode::default(),
);
self.infcx
.resolve_regions_and_report_errors(target_def_id, &outlives_env);

let err = self
.infcx
Expand Down

0 comments on commit 57a6b00

Please sign in to comment.