Rollup merge of #43598 - ibabushkin:master, r=eddyb

frewsxcv · web-flow · commit 368f1a8e9366 · 2017-08-02T01:22:30.000Z
Derive `Hash` on `AssociatedKind`. This is a trivial change useful in downstream code poking in rustc's innards, in particular the semver verification tool I'm currently working on. r? @eddyb
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
@@ -174,7 +174,7 @@ pub struct AssociatedItem {
     pub method_has_self_argument: bool,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, RustcEncodable, RustcDecodable)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, RustcEncodable, RustcDecodable)]
 pub enum AssociatedKind {
     Const,
     Method,

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ pub struct AssociatedItem {`
`174`	`174`	`pub method_has_self_argument: bool,`
`175`	`175`	`}`
`176`	`176`
`177`		`-#[derive(Copy, Clone, PartialEq, Eq, Debug, RustcEncodable, RustcDecodable)]`
	`177`	`+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, RustcEncodable, RustcDecodable)]`
`178`	`178`	`pub enum AssociatedKind {`
`179`	`179`	`Const,`
`180`	`180`	`Method,`