From 2ae2b978f3fad7a58cb129333b36a210bb200488 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 19 Dec 2024 16:26:18 -0500 Subject: jolly winter cleanup (#251) * ci: bump DeterminateSystems/nix-installer-action from 13 to 16 Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 13 to 16. - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v13...v16) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * crates: bump serde from 1.0.209 to 1.0.215 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.209 to 1.0.215. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.209...v1.0.215) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * crates: bump serde_json from 1.0.127 to 1.0.133 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.127 to 1.0.133. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.127...v1.0.133) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * crates: bump tokio from 1.40.0 to 1.41.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.40.0 to 1.41.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.41.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * crates: bump reqwest from 0.12.7 to 0.12.9 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.12.7 to 0.12.9. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.7...v0.12.9) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * nix: update flake.lock * ci: bump DeterminateSystems/magic-nix-cache-action from 7 to 8 Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 7 to 8. - [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases) - [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v7...v8) --- updated-dependencies: - dependency-name: DeterminateSystems/magic-nix-cache-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * treewide: debrand * nix: adopt new darwin sdk * nix: drop treefmt * nix: misc formatting changes * ci: cleanup * nix: pass version info to static builds * nix: mv {derivation,package}.nix * eyre -> anyhow * remove 2024 edition warnings * format with rustfmt * remove optional commands * ci: don't include internal variables in job names * nix: enable for lto builds --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: getchoo-bot[bot] <183349775+getchoo-bot[bot]@users.noreply.github.com> --- src/http/mod.rs | 4 ++-- src/http/shiggy.rs | 2 +- src/http/teawie.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/http') diff --git a/src/http/mod.rs b/src/http/mod.rs index 0f16852..dde769c 100644 --- a/src/http/mod.rs +++ b/src/http/mod.rs @@ -1,4 +1,4 @@ -use eyre::Result; +use anyhow::Result; use log::trace; use serde::de::DeserializeOwned; @@ -19,7 +19,7 @@ impl Ext for Client { fn default() -> Self { reqwest::ClientBuilder::new() .user_agent(format!( - "teawie-bot/{}", + "chill-discord-bot/{}", option_env!("CARGO_PKG_VERSION").unwrap_or("development") )) .build() diff --git a/src/http/shiggy.rs b/src/http/shiggy.rs index 397d397..a0af0b3 100644 --- a/src/http/shiggy.rs +++ b/src/http/shiggy.rs @@ -1,4 +1,4 @@ -use eyre::Result; +use anyhow::Result; use serde::Deserialize; const SHIGGY: &str = "https://safebooru.donmai.us"; diff --git a/src/http/teawie.rs b/src/http/teawie.rs index 368fad5..cd83ca2 100644 --- a/src/http/teawie.rs +++ b/src/http/teawie.rs @@ -1,4 +1,4 @@ -use eyre::{bail, OptionExt, Result}; +use anyhow::{bail, Context, Result}; use serde::{Deserialize, Serialize}; // https://github.com/getchoo/teawieAPI @@ -24,5 +24,5 @@ where }; json.url - .ok_or_eyre("TeawieAPI didn't return an error or URL???") + .context("TeawieAPI didn't return an error or URL???") } -- cgit v1.2.3