Remove failure package (#166)

* Remove dependency on failure * Update flatpak cargo-lock * Update cargo version * Update release manifest
PhilipK · Jun 7, 2022 · 0385dfb · 0385dfb
1 parent ded5266
commit 0385dfb
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 296 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,13 @@
 [package]
 edition = "2021"
 name = "boilr"
-version = "1.3.15"
+version = "1.3.16"
 
 [dependencies]
 base64 = "^0.13.0"
 chrono = "^0.4.19"
 config = "^0.11.0"
-copypasta = "0.7.1"
-failure = "^0.1.8"
+copypasta = "^0.7.1"
 flate2 = "^1.0.23"
 is_executable = "^1.0.1"
 nom = "^7.1.1"

diff --git a/flatpak/cargo-lock.json b/flatpak/cargo-lock.json
@@ -25,19 +25,6 @@
         "dest": "cargo/vendor/ab_glyph_rasterizer-0.1.5",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/addr2line/addr2line-0.17.0.crate",
-        "sha256": "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b",
-        "dest": "cargo/vendor/addr2line-0.17.0"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b\", \"files\": {}}",
-        "dest": "cargo/vendor/addr2line-0.17.0",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -168,19 +155,6 @@
         "dest": "cargo/vendor/autocfg-1.1.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/backtrace/backtrace-0.3.65.crate",
-        "sha256": "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61",
-        "dest": "cargo/vendor/backtrace-0.3.65"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61\", \"files\": {}}",
-        "dest": "cargo/vendor/backtrace-0.3.65",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -974,32 +948,6 @@
         "dest": "cargo/vendor/exr-1.4.2",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/failure/failure-0.1.8.crate",
-        "sha256": "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86",
-        "dest": "cargo/vendor/failure-0.1.8"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86\", \"files\": {}}",
-        "dest": "cargo/vendor/failure-0.1.8",
-        "dest-filename": ".cargo-checksum.json"
-    },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/failure_derive/failure_derive-0.1.8.crate",
-        "sha256": "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4",
-        "dest": "cargo/vendor/failure_derive-0.1.8"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4\", \"files\": {}}",
-        "dest": "cargo/vendor/failure_derive-0.1.8",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -1273,19 +1221,6 @@
         "dest": "cargo/vendor/gif-0.11.3",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/gimli/gimli-0.26.1.crate",
-        "sha256": "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4",
-        "dest": "cargo/vendor/gimli-0.26.1"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4\", \"files\": {}}",
-        "dest": "cargo/vendor/gimli-0.26.1",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -2313,19 +2248,6 @@
         "dest": "cargo/vendor/objc_id-0.1.1",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/object/object-0.28.4.crate",
-        "sha256": "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424",
-        "dest": "cargo/vendor/object-0.28.4"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424\", \"files\": {}}",
-        "dest": "cargo/vendor/object-0.28.4",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -2794,19 +2716,6 @@
         "dest": "cargo/vendor/rust-ini-0.13.0",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.21.crate",
-        "sha256": "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342",
-        "dest": "cargo/vendor/rustc-demangle-0.1.21"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342\", \"files\": {}}",
-        "dest": "cargo/vendor/rustc-demangle-0.1.21",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",
@@ -3249,19 +3158,6 @@
         "dest": "cargo/vendor/syn-1.0.94",
         "dest-filename": ".cargo-checksum.json"
     },
-    {
-        "type": "archive",
-        "archive-type": "tar-gzip",
-        "url": "https://static.crates.io/crates/synstructure/synstructure-0.12.6.crate",
-        "sha256": "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f",
-        "dest": "cargo/vendor/synstructure-0.12.6"
-    },
-    {
-        "type": "inline",
-        "contents": "{\"package\": \"f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f\", \"files\": {}}",
-        "dest": "cargo/vendor/synstructure-0.12.6",
-        "dest-filename": ".cargo-checksum.json"
-    },
     {
         "type": "archive",
         "archive-type": "tar-gzip",

diff --git a/flatpak/io.github.philipk.boilr.appdata.xml b/flatpak/io.github.philipk.boilr.appdata.xml
@@ -25,6 +25,16 @@ https://hughsie.github.io/oars/index.html
 -->
   <content_rating type="oars-1.1" />
   <releases>
+
+
+  <release version="1.3.16" date="2022-06-07">
+      <description>
+        <ul>
+          <li>Removed dependency on unsafe package failure</li>          
+        </ul>
+      </description>
+  </release>
+
   <release version="1.3.14" date="2022-05-30">
       <description>
         <ul>

diff --git a/src/egs/epic_platform.rs b/src/egs/epic_platform.rs
@@ -1,9 +1,6 @@
 use crate::platform::{Platform, SettingsValidity};
 
-use super::{
-    get_egs_manifests, get_manifests::EpicGamesManifestsError, EpicGamesLauncherSettings,
-    ManifestItem,
-};
+use super::{get_egs_manifests, EpicGamesLauncherSettings, ManifestItem};
 
 pub struct EpicPlatform {
     settings: EpicGamesLauncherSettings,
@@ -17,7 +14,7 @@ impl EpicPlatform {
     }
 }
 
-impl Platform<ManifestItem, EpicGamesManifestsError> for EpicPlatform {
+impl Platform<ManifestItem, String> for EpicPlatform {
     fn enabled(&self) -> bool {
         self.settings.enabled
     }
@@ -26,7 +23,7 @@ impl Platform<ManifestItem, EpicGamesManifestsError> for EpicPlatform {
         "EGS"
     }
 
-    fn get_shortcuts(&self) -> Result<Vec<ManifestItem>, EpicGamesManifestsError> {
+    fn get_shortcuts(&self) -> Result<Vec<ManifestItem>, String> {
         get_egs_manifests(&self.settings)
     }