Auto merge of #322 - JohnTitor:rustup-2022-06-20, r=JohnTitor

Rustup to rust-lang/rust#98247

Closes #320

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-15` toolchain.
-You can install it by using `rustup install nightly-2022-06-15` if you already have rustup.
+It's recommended to use `nightly-2022-06-20` toolchain.
+You can install it by using `rustup install nightly-2022-06-20` if you already have rustup.
 Then you can do:
 
 ```sh
-$ 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
+$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-06-20
+$ cargo +nightly-2022-06-20 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-15 install --git https://github.com/rust-lang/rust-semverver
+cargo +nightly-2022-06-20 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-15"
+channel = "nightly-2022-06-20"
 components = ["llvm-tools-preview", "rustc-dev"]

src/lib.rs

@@ -13,6 +13,7 @@ extern crate rustc_middle;
 extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_trait_selection;
+extern crate rustc_type_ir;
 
 mod changes;
 mod mapping;

src/translate.rs

@@ -334,8 +334,8 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
     /// Translate a region.
     fn translate_region(&self, region: Region<'tcx>) -> Region<'tcx> {
         use rustc_middle::ty::BoundRegionKind::*;
-        use rustc_middle::ty::RegionKind::*;
         use rustc_middle::ty::{EarlyBoundRegion, FreeRegion};
+        use rustc_type_ir::RegionKind::*;
 
         if !self.translate_params {
             return region;