From 2d617f14640b27383daa7c2271e58d3bb2153353 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Tue, 21 Jun 2022 15:23:42 +0000 Subject: [PATCH] use regex::Regex in pixiv link parse --- Cargo.lock | 1 + Cargo.toml | 1 + src/pixiv_link.rs | 6 +----- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71a94a0..6bf840f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1279,6 +1279,7 @@ dependencies = [ "modular-bitfield", "parse-size", "proc_macros", + "regex", "reqwest", "tokio", "url", diff --git a/Cargo.toml b/Cargo.toml index db406c1..90f2071 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,6 +27,7 @@ lazy_static = "1.4" modular-bitfield = "0.11" parse-size = "1" proc_macros = { path = "proc_macros" } +regex = "1" reqwest = { version = "0.11", features = ["brotli", "deflate", "gzip", "rustls-tls", "socks", "stream"] } RustyXML = "0.3" tokio = { version = "1.19", features = ["rt", "macros", "rt-multi-thread", "time"] } diff --git a/src/pixiv_link.rs b/src/pixiv_link.rs index 411c5e4..c60c54d 100644 --- a/src/pixiv_link.rs +++ b/src/pixiv_link.rs @@ -1,5 +1,5 @@ use crate::ext::json::ToJson; -use fancy_regex::Regex; +use regex::Regex; use json::JsonValue; use reqwest::IntoUrl; use std::convert::TryInto; @@ -28,10 +28,6 @@ impl PixivID { return Some(PixivID::Artwork(num.unwrap())); } let re = RE.captures(s); - if re.is_err() { - return None; - } - let re = re.unwrap(); if re.is_some() { let r = re.unwrap().name("id"); if r.is_some() {