From e3f545914735d3fab18f1da512e3f1b0e18cf8de Mon Sep 17 00:00:00 2001
From: Yuki Okushi <jtitor@2k36.org>
Date: Mon, 20 Jun 2022 22:54:27 +0900
Subject: [PATCH] Rustup to rust-lang/rust#98247

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
---
 README.md        | 10 +++++-----
 rust-toolchain   |  2 +-
 src/lib.rs       |  1 +
 src/translate.rs |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c7a2997d..a5364211 100644
--- a/README.md
+++ b/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
diff --git a/rust-toolchain b/rust-toolchain
index 6fbb369b..49269dba 100644
--- a/rust-toolchain
+++ b/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"]
diff --git a/src/lib.rs b/src/lib.rs
index 15d2b9f6..6bbab40a 100644
--- a/src/lib.rs
+++ b/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;
diff --git a/src/translate.rs b/src/translate.rs
index aa0160c8..3cd403d8 100644
--- a/src/translate.rs
+++ b/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;