Skip to content

Commit 0385dfb

Browse files
PhilipKPhilipK
authored
Remove failure package (#166)
* Remove dependency on failure * Update flatpak cargo-lock * Update cargo version * Update release manifest
1 parent ded5266 commit 0385dfb

File tree

9 files changed

+48
-296
lines changed

9 files changed

+48
-296
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
[package]
22
edition = "2021"
33
name = "boilr"
4-
version = "1.3.15"
4+
version = "1.3.16"
55

66
[dependencies]
77
base64 = "^0.13.0"
88
chrono = "^0.4.19"
99
config = "^0.11.0"
10-
copypasta = "0.7.1"
11-
failure = "^0.1.8"
10+
copypasta = "^0.7.1"
1211
flate2 = "^1.0.23"
1312
is_executable = "^1.0.1"
1413
nom = "^7.1.1"

‎flatpak/cargo-lock.json‎

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,6 @@
2525
"dest": "cargo/vendor/ab_glyph_rasterizer-0.1.5",
2626
"dest-filename": ".cargo-checksum.json"
2727
},
28-
{
29-
"type": "archive",
30-
"archive-type": "tar-gzip",
31-
"url": "https://static.crates.io/crates/addr2line/addr2line-0.17.0.crate",
32-
"sha256": "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b",
33-
"dest": "cargo/vendor/addr2line-0.17.0"
34-
},
35-
{
36-
"type": "inline",
37-
"contents": "{\"package\": \"b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b\", \"files\": {}}",
38-
"dest": "cargo/vendor/addr2line-0.17.0",
39-
"dest-filename": ".cargo-checksum.json"
40-
},
4128
{
4229
"type": "archive",
4330
"archive-type": "tar-gzip",
@@ -168,19 +155,6 @@
168155
"dest": "cargo/vendor/autocfg-1.1.0",
169156
"dest-filename": ".cargo-checksum.json"
170157
},
171-
{
172-
"type": "archive",
173-
"archive-type": "tar-gzip",
174-
"url": "https://static.crates.io/crates/backtrace/backtrace-0.3.65.crate",
175-
"sha256": "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61",
176-
"dest": "cargo/vendor/backtrace-0.3.65"
177-
},
178-
{
179-
"type": "inline",
180-
"contents": "{\"package\": \"11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61\", \"files\": {}}",
181-
"dest": "cargo/vendor/backtrace-0.3.65",
182-
"dest-filename": ".cargo-checksum.json"
183-
},
184158
{
185159
"type": "archive",
186160
"archive-type": "tar-gzip",
@@ -974,32 +948,6 @@
974948
"dest": "cargo/vendor/exr-1.4.2",
975949
"dest-filename": ".cargo-checksum.json"
976950
},
977-
{
978-
"type": "archive",
979-
"archive-type": "tar-gzip",
980-
"url": "https://static.crates.io/crates/failure/failure-0.1.8.crate",
981-
"sha256": "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86",
982-
"dest": "cargo/vendor/failure-0.1.8"
983-
},
984-
{
985-
"type": "inline",
986-
"contents": "{\"package\": \"d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86\", \"files\": {}}",
987-
"dest": "cargo/vendor/failure-0.1.8",
988-
"dest-filename": ".cargo-checksum.json"
989-
},
990-
{
991-
"type": "archive",
992-
"archive-type": "tar-gzip",
993-
"url": "https://static.crates.io/crates/failure_derive/failure_derive-0.1.8.crate",
994-
"sha256": "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4",
995-
"dest": "cargo/vendor/failure_derive-0.1.8"
996-
},
997-
{
998-
"type": "inline",
999-
"contents": "{\"package\": \"aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4\", \"files\": {}}",
1000-
"dest": "cargo/vendor/failure_derive-0.1.8",
1001-
"dest-filename": ".cargo-checksum.json"
1002-
},
1003951
{
1004952
"type": "archive",
1005953
"archive-type": "tar-gzip",
@@ -1273,19 +1221,6 @@
12731221
"dest": "cargo/vendor/gif-0.11.3",
12741222
"dest-filename": ".cargo-checksum.json"
12751223
},
1276-
{
1277-
"type": "archive",
1278-
"archive-type": "tar-gzip",
1279-
"url": "https://static.crates.io/crates/gimli/gimli-0.26.1.crate",
1280-
"sha256": "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4",
1281-
"dest": "cargo/vendor/gimli-0.26.1"
1282-
},
1283-
{
1284-
"type": "inline",
1285-
"contents": "{\"package\": \"78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4\", \"files\": {}}",
1286-
"dest": "cargo/vendor/gimli-0.26.1",
1287-
"dest-filename": ".cargo-checksum.json"
1288-
},
12891224
{
12901225
"type": "archive",
12911226
"archive-type": "tar-gzip",
@@ -2313,19 +2248,6 @@
23132248
"dest": "cargo/vendor/objc_id-0.1.1",
23142249
"dest-filename": ".cargo-checksum.json"
23152250
},
2316-
{
2317-
"type": "archive",
2318-
"archive-type": "tar-gzip",
2319-
"url": "https://static.crates.io/crates/object/object-0.28.4.crate",
2320-
"sha256": "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424",
2321-
"dest": "cargo/vendor/object-0.28.4"
2322-
},
2323-
{
2324-
"type": "inline",
2325-
"contents": "{\"package\": \"e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424\", \"files\": {}}",
2326-
"dest": "cargo/vendor/object-0.28.4",
2327-
"dest-filename": ".cargo-checksum.json"
2328-
},
23292251
{
23302252
"type": "archive",
23312253
"archive-type": "tar-gzip",
@@ -2794,19 +2716,6 @@
27942716
"dest": "cargo/vendor/rust-ini-0.13.0",
27952717
"dest-filename": ".cargo-checksum.json"
27962718
},
2797-
{
2798-
"type": "archive",
2799-
"archive-type": "tar-gzip",
2800-
"url": "https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.21.crate",
2801-
"sha256": "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342",
2802-
"dest": "cargo/vendor/rustc-demangle-0.1.21"
2803-
},
2804-
{
2805-
"type": "inline",
2806-
"contents": "{\"package\": \"7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342\", \"files\": {}}",
2807-
"dest": "cargo/vendor/rustc-demangle-0.1.21",
2808-
"dest-filename": ".cargo-checksum.json"
2809-
},
28102719
{
28112720
"type": "archive",
28122721
"archive-type": "tar-gzip",
@@ -3249,19 +3158,6 @@
32493158
"dest": "cargo/vendor/syn-1.0.94",
32503159
"dest-filename": ".cargo-checksum.json"
32513160
},
3252-
{
3253-
"type": "archive",
3254-
"archive-type": "tar-gzip",
3255-
"url": "https://static.crates.io/crates/synstructure/synstructure-0.12.6.crate",
3256-
"sha256": "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f",
3257-
"dest": "cargo/vendor/synstructure-0.12.6"
3258-
},
3259-
{
3260-
"type": "inline",
3261-
"contents": "{\"package\": \"f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f\", \"files\": {}}",
3262-
"dest": "cargo/vendor/synstructure-0.12.6",
3263-
"dest-filename": ".cargo-checksum.json"
3264-
},
32653161
{
32663162
"type": "archive",
32673163
"archive-type": "tar-gzip",

‎flatpak/io.github.philipk.boilr.appdata.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ https://hughsie.github.io/oars/index.html
2525
-->
2626
<content_rating type="oars-1.1" />
2727
<releases>
28+
29+
30+
<release version="1.3.16" date="2022-06-07">
31+
<description>
32+
<ul>
33+
<li>Removed dependency on unsafe package failure</li>
34+
</ul>
35+
</description>
36+
</release>
37+
2838
<release version="1.3.14" date="2022-05-30">
2939
<description>
3040
<ul>

‎src/egs/epic_platform.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
use crate::platform::{Platform, SettingsValidity};
22

3-
use super::{
4-
get_egs_manifests, get_manifests::EpicGamesManifestsError, EpicGamesLauncherSettings,
5-
ManifestItem,
6-
};
3+
use super::{get_egs_manifests, EpicGamesLauncherSettings, ManifestItem};
74

85
pub struct EpicPlatform {
96
settings: EpicGamesLauncherSettings,
@@ -17,7 +14,7 @@ impl EpicPlatform {
1714
}
1815
}
1916

20-
impl Platform<ManifestItem, EpicGamesManifestsError> for EpicPlatform {
17+
impl Platform<ManifestItem, String> for EpicPlatform {
2118
fn enabled(&self) -> bool {
2219
self.settings.enabled
2320
}
@@ -26,7 +23,7 @@ impl Platform<ManifestItem, EpicGamesManifestsError> for EpicPlatform {
2623
"EGS"
2724
}
2825

29-
fn get_shortcuts(&self) -> Result<Vec<ManifestItem>, EpicGamesManifestsError> {
26+
fn get_shortcuts(&self) -> Result<Vec<ManifestItem>, String> {
3027
get_egs_manifests(&self.settings)
3128
}
3229

0 commit comments

Comments
 (0)