From 3868d69d236416d3ca85d3ffd11c9a1f5f0509be Mon Sep 17 00:00:00 2001 From: lifegpc Date: Fri, 13 May 2022 12:25:32 +0800 Subject: [PATCH] Move stdext to ext::try_err --- src/author_name_filter.rs | 2 +- src/ext/mod.rs | 1 + src/{stdext.rs => ext/try_err.rs} | 0 src/ext/use_or_not.rs | 2 +- src/main.rs | 1 - src/ugoira.rs | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename src/{stdext.rs => ext/try_err.rs} (100%) diff --git a/src/author_name_filter.rs b/src/author_name_filter.rs index dedcab9..0d2e4b1 100644 --- a/src/author_name_filter.rs +++ b/src/author_name_filter.rs @@ -1,6 +1,6 @@ use crate::ext::json::ToJson; use crate::gettext; -use crate::stdext::TryErr; +use crate::ext::try_err::TryErr; use json::JsonValue; use regex::Regex; use std::cmp::PartialEq; diff --git a/src/ext/mod.rs b/src/ext/mod.rs index d9f5e71..3a5957a 100644 --- a/src/ext/mod.rs +++ b/src/ext/mod.rs @@ -4,4 +4,5 @@ pub mod flagset; pub mod json; #[cfg(any(feature = "exif", feature = "avdict", feature = "ugoira"))] pub mod rawhandle; +pub mod try_err; pub mod use_or_not; diff --git a/src/stdext.rs b/src/ext/try_err.rs similarity index 100% rename from src/stdext.rs rename to src/ext/try_err.rs diff --git a/src/ext/use_or_not.rs b/src/ext/use_or_not.rs index d604864..61758d7 100644 --- a/src/ext/use_or_not.rs +++ b/src/ext/use_or_not.rs @@ -1,7 +1,7 @@ use crate::ext::json::FromJson; use crate::ext::json::ToJson; use crate::gettext; -use crate::stdext::TryErr; +use crate::ext::try_err::TryErr; use std::str::FromStr; #[derive(Clone, Copy, Debug, PartialEq, PartialOrd)] diff --git a/src/main.rs b/src/main.rs index a006a45..b2890ef 100644 --- a/src/main.rs +++ b/src/main.rs @@ -51,7 +51,6 @@ mod pixiv_web; mod retry_interval; mod settings; mod settings_list; -mod stdext; #[cfg(feature = "ugoira")] mod ugoira; mod utils; diff --git a/src/ugoira.rs b/src/ugoira.rs index 796d4f3..3c24815 100644 --- a/src/ugoira.rs +++ b/src/ugoira.rs @@ -6,7 +6,7 @@ use crate::ext::cstr::ToCStrError; use crate::ext::json::ToJson; use crate::ext::rawhandle::ToRawHandle; use crate::gettext; -use crate::stdext::TryErr; +use crate::ext::try_err::TryErr; use std::convert::AsRef; use std::default::Default; use std::ffi::CStr;