Auto merge of #319 - JohnTitor:rustup-2022-06-15, r=JohnTitor

Rustup to rust-lang/rust#98041

Fixes #318

Signed-off-by: Yuki Okushi <[email protected]>

Author: bors

README.md

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

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"]

src/typeck.rs

@@ -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| {
@@ -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