Use derive_more

jasonwhite · jasonwhite · commit 9908e1ae030e · 2019-04-23T16:50:09.000-07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,3 +18,4 @@ license = "MIT"
 chrono = { version = "0.4", features = ["serde"] }
 hex = "0.3"
 serde = { version = "1", features = ["derive"] }
+derive_more = "0.14"
diff --git a/src/events.rs b/src/events.rs
@@ -26,6 +26,7 @@ use serde::{
     de::{self, Deserializer},
     Deserialize,
 };
+use derive_more::From;
 
 use std::fmt;
 use std::str::FromStr;
@@ -344,7 +345,7 @@ impl fmt::Display for EventType {
 ///
 /// For documentation on each of these events, see:
 /// https://developer.github.com/v3/activity/events/types/
-#[derive(Deserialize, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Deserialize, From, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[allow(clippy::large_enum_variant)]
 pub enum Event {
     Ping(PingEvent),
@@ -361,8 +362,8 @@ pub enum Event {
     Gollum(GollumEvent),
     Installation(InstallationEvent),
     InstallationRepositories(InstallationRepositoriesEvent),
-    IntegrationInstallation(InstallationEvent),
-    IntegrationInstallationRepositories(InstallationRepositoriesEvent),
+    IntegrationInstallation(IntegrationInstallationEvent),
+    IntegrationInstallationRepositories(IntegrationInstallationRepositoriesEvent),
     IssueComment(IssueCommentEvent),
     Issues(IssuesEvent),
     Label(LabelEvent),
@@ -702,6 +703,26 @@ impl AppEvent for InstallationRepositoriesEvent {
     }
 }
 
+/// Event deprecated by GitHub. Use `InstallationEvent` instead.
+#[derive(Deserialize, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+pub struct IntegrationInstallationEvent;
+
+impl AppEvent for IntegrationInstallationEvent {
+    fn installation(&self) -> Option<u64> {
+        None
+    }
+}
+
+/// Event deprecated by GitHub. Use `InstallationRepositoriesEvent` instead.
+#[derive(Deserialize, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+pub struct IntegrationInstallationRepositoriesEvent;
+
+impl AppEvent for IntegrationInstallationRepositoriesEvent {
+    fn installation(&self) -> Option<u64> {
+        None
+    }
+}
+
 #[derive(
     Deserialize, Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash,
 )]
