diff --git a/rust-toolchain b/rust-toolchain
index 4aec5c6b..dce0ff04 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-06-10
+nightly-2020-06-16
diff --git a/src/lib.rs b/src/lib.rs
index bfd61787..7f46a102 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,6 +2,9 @@
 #![allow(clippy::similar_names)]
 #![allow(clippy::single_match_else)]
 #![allow(clippy::too_many_lines)]
+// Needs a nightly feature, doesn't bring that much to the table
+// FIXME: Apply Clippy lint once or-patterns are stabilized (rust-lang/rust#54883)
+#![allow(clippy::unnested_or_patterns)]
 #![deny(warnings)]
 
 extern crate rustc_hir;
diff --git a/src/mapping.rs b/src/mapping.rs
index ca1f08aa..4a35d62d 100644
--- a/src/mapping.rs
+++ b/src/mapping.rs
@@ -50,8 +50,7 @@ impl Hash for InherentEntry {
         match self.kind {
             AssocKind::Const => 0_u8.hash(hasher),
             AssocKind::Fn => 1_u8.hash(hasher),
-            AssocKind::OpaqueTy => 2_u8.hash(hasher),
-            AssocKind::Type => 3_u8.hash(hasher),
+            AssocKind::Type => 2_u8.hash(hasher),
         }
 
         self.name.hash(hasher);
@@ -366,8 +365,7 @@ impl NameMapping {
                 TraitAlias | // TODO: will need some handling later on
                 AssocTy |
                 TyParam |
-                OpaqueTy |
-                AssocOpaqueTy => Some(&mut self.type_map),
+                OpaqueTy => Some(&mut self.type_map),
                 Fn |
                 Const |
                 ConstParam |