Skip to content

Commit 164d633

Browse files
build: update strum library
1 parent d184a74 commit 164d633

11 files changed

Lines changed: 264 additions & 127 deletions

File tree

Cargo.lock

Lines changed: 247 additions & 115 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exclude = [
1919
[dependencies]
2020
# ratatui related dependencies
2121
ratatui = { version = "0.29.0", features = ["all-widgets", "palette", "unstable-widget-ref"] }
22-
ratatui-image = { version = "2.0.1", features = ["rustix"]}
22+
ratatui-image = { version = "1.0.5", features = ["rustix"]}
2323
throbber-widgets-tui = "0.8.0"
2424
tui-input = { version = "0.14.0", features = ["crossterm"], default-features = false}
2525
tui-widget-list = "0.13.0"
@@ -54,7 +54,7 @@ lopdf = "0.37.0"
5454
flate2 = "1.1.2"
5555

5656
[dev-dependencies]
57-
httpmock = "0.8.0-alpha.1"
57+
httpmock = "0.7.0-rc.1"
5858
pretty_assertions = "1.4.0"
5959
rusty-hook = "0.11.2"
6060
fake = "4.4.0"

src/backend.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ use std::path::{Path, PathBuf};
33

44
use manga_tui::exists;
55
use once_cell::sync::Lazy;
6-
use strum::{Display, EnumIter, IntoEnumIterator};
6+
use strum::IntoEnumIterator;
7+
use strum_macros::{Display, EnumIter};
78

89
use self::error_log::create_error_logs_files;
910
use crate::config::build_config_file;

src/backend/database.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ use chrono::Utc;
6262
use manga_tui::SearchTerm;
6363
use rusqlite::types::ToSqlOutput;
6464
use rusqlite::{Connection, OptionalExtension, ToSql, params};
65-
use strum::{Display, EnumIter};
65+
use strum_macros::{Display, EnumIter};
6666

6767
use super::AppDirectories;
6868
use super::manga_provider::{Languages, MangaProviders};

src/backend/manga_provider.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ use ratatui::style::{Color, Style, Stylize};
1313
use ratatui::text::Span;
1414
use reqwest::Url;
1515
use serde::{Deserialize, Serialize};
16-
use strum::{Display, EnumIter, IntoEnumIterator};
16+
use strum::IntoEnumIterator;
17+
use strum_macros::{Display, EnumIter};
1718

1819
use super::database::ChapterBookmarked;
1920
use super::tui::Events;

src/backend/manga_provider/mangadex/filters/api_parameter.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ use std::fmt::{Debug, Write};
33
use std::ops::Deref;
44

55
use serde::{Deserialize, Serialize};
6-
use strum::{Display, EnumIter, IntoEnumIterator};
6+
use strum::IntoEnumIterator;
7+
use strum_macros::{Display, EnumIter};
78

89
use super::filter_provider::{TagListItem, TagListItemState};
910
use crate::backend::manga_provider::Languages;
@@ -12,7 +13,7 @@ pub trait IntoParam: Debug {
1213
fn into_param(self) -> String;
1314
}
1415

15-
#[derive(Display, Clone, Debug, EnumIter, Default, PartialEq, Eq, Serialize, Deserialize)]
16+
#[derive(Clone, Debug, Display, EnumIter, Default, PartialEq, Eq, Serialize, Deserialize)]
1617
pub enum ContentRating {
1718
#[default]
1819
#[strum(to_string = "safe")]

src/backend/manga_provider/mangadex/filters/filter_provider.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use manga_tui::SearchTerm;
66
use ratatui::style::Stylize;
77
use ratatui::text::Span;
88
use ratatui::widgets::*;
9-
use strum::{Display, IntoEnumIterator};
9+
use strum::IntoEnumIterator;
10+
use strum_macros::Display;
1011
use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
1112
use tui_input::Input;
1213
use tui_input::backend::crossterm::EventHandler;

src/cli.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use std::process::exit;
66

77
use clap::{Parser, Subcommand, crate_version};
88
use serde::{Deserialize, Serialize};
9-
use strum::{Display, IntoEnumIterator};
9+
use strum::IntoEnumIterator;
10+
use strum_macros::Display;
1011

1112
use crate::backend::APP_DATA_DIR;
1213
use crate::backend::error_log::write_to_error_log;

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::sync::LazyLock;
1414
use manga_tui::exists;
1515
use once_cell::sync::OnceCell;
1616
use serde::{Deserialize, Serialize};
17-
use strum::{Display, EnumIter};
17+
use strum_macros::{Display, EnumIter};
1818
use toml::Table;
1919

2020
use crate::backend::manga_provider::MangaProviders;

src/view/pages.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use strum::{Display, EnumCount, EnumIter, FromRepr};
1+
use strum_macros::{Display, EnumCount, EnumIter, FromRepr};
22

33
pub mod feed;
44
pub mod home;

0 commit comments

Comments
 (0)