Merge pull request rust-lang#111 from bjorn3/rustup

Rustup to rustc 1.40.0-nightly (87cbf0a 2019-11-01)

README.md

@@ -32,6 +32,7 @@ If you are already using Rust nightly and have successfully installed tools like
 
 ```sh
 $ rustup update nightly
+$ rustup component add rustc-dev --toolchain nightly
 $ cargo +nightly install semverver
 ```
 
@@ -43,6 +44,7 @@ You can also install the newest version of the tool from git:
 
 ```sh
 $ rustup update nightly
+$ rustup component add rustc-dev --toolchain nightly
 $ cargo +nightly install --git https://github.com/rust-dev-tools/rust-semverver
 ```
 

ci/run.sh

@@ -5,6 +5,8 @@ set -ex
 export RUST_BACKTRACE=full
 #export RUST_TEST_NOCAPTURE=1
 
+rustup component add rustc-dev
+
 cargo build
 cargo test --verbose -- --nocapture
 

rust-toolchain

@@ -0,0 +1 @@
+nightly

src/mapping.rs

@@ -12,10 +12,11 @@ use rustc::{
     ty::{AssocKind, GenericParamDef, GenericParamDefKind},
 };
 use std::collections::{BTreeSet, HashMap, HashSet, VecDeque};
+use std::hash::{Hash, Hasher};
 use syntax::ast::Name;
 
 /// A description of an item found in an inherent impl.
-#[derive(Debug, PartialEq, Eq, Hash)]
+#[derive(Debug, PartialEq)]
 pub struct InherentEntry {
     /// The parent item's `DefId`.
     pub parent_def_id: DefId,
@@ -25,6 +26,36 @@ pub struct InherentEntry {
     pub name: Name,
 }
 
+impl Eq for InherentEntry {}
+
+fn assert_impl_eq<T: Eq>() {}
+
+#[allow(dead_code)]
+fn assert_inherent_entry_members_impl_eq() {
+    assert_impl_eq::<DefId>();
+
+    // FIXME derive Eq again once AssocKind impls Eq again.
+    // assert_impl_eq::<AssocKind>();
+
+    assert_impl_eq::<Name>();
+}
+
+impl Hash for InherentEntry {
+    fn hash<H: Hasher>(&self, hasher: &mut H) {
+        self.parent_def_id.hash(hasher);
+
+        // FIXME derive Hash again once AssocKind derives Hash again.
+        match self.kind {
+            AssocKind::Const => 0u8.hash(hasher),
+            AssocKind::Method => 1u8.hash(hasher),
+            AssocKind::OpaqueTy => 2u8.hash(hasher),
+            AssocKind::Type => 3u8.hash(hasher),
+        }
+
+        self.name.hash(hasher);
+    }
+}
+
 /// A set of pairs of impl- and item `DefId`s for inherent associated items.
 pub type InherentImplSet = BTreeSet<(DefId, DefId)>;