From be813cf643514d7d19bf4d892bb9d535322eb3dc Mon Sep 17 00:00:00 2001 From: yggverse Date: Sun, 20 Oct 2024 14:18:29 +0300 Subject: [PATCH] remove extra dependencies --- Cargo.toml | 9 +++++---- README.md | 2 +- src/line/code/inline.rs | 2 +- src/line/code/multiline.rs | 2 +- src/line/header.rs | 2 +- src/line/link.rs | 4 +--- src/line/list.rs | 2 +- src/line/quote.rs | 2 +- tests/integration.rs | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 479de04..afc20d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ggemtext" -version = "0.1.3" +version = "0.2.0" edition = "2021" license = "MIT" readme = "README.md" @@ -15,6 +15,7 @@ categories = [ ] repository = "https://github.com/YGGverse/ggemtext" -[dependencies.gtk] -package = "gtk4" -version = "0.9.1" +[dependencies.glib] +package = "glib" +version = "0.20.4" +features = ["v2_66"] diff --git a/README.md b/README.md index 5ac1f1e..2e0dd85 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ match Header::from("# H1") { match Link::from( "=> gemini://geminiprotocol.net 1965-01-19 Gemini", None, // absolute path given, base not wanted - Some(>k::glib::TimeZone::local()), + Some(&glib::TimeZone::local()), ) { Some(link) => { // Alt diff --git a/src/line/code/inline.rs b/src/line/code/inline.rs index 7baddb8..9f3ef8d 100644 --- a/src/line/code/inline.rs +++ b/src/line/code/inline.rs @@ -1,4 +1,4 @@ -use gtk::glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; +use glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; pub struct Inline { pub value: GString, diff --git a/src/line/code/multiline.rs b/src/line/code/multiline.rs index cef1518..0180df1 100644 --- a/src/line/code/multiline.rs +++ b/src/line/code/multiline.rs @@ -1,4 +1,4 @@ -use gtk::glib::GString; +use glib::GString; pub struct Multiline { pub alt: Option, diff --git a/src/line/header.rs b/src/line/header.rs index 24dc248..35cfab4 100644 --- a/src/line/header.rs +++ b/src/line/header.rs @@ -1,4 +1,4 @@ -use gtk::glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; +use glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; pub enum Level { H1, diff --git a/src/line/link.rs b/src/line/link.rs index 09543b3..e38d683 100644 --- a/src/line/link.rs +++ b/src/line/link.rs @@ -1,6 +1,4 @@ -use gtk::glib::{ - DateTime, GString, Regex, RegexCompileFlags, RegexMatchFlags, TimeZone, Uri, UriFlags, -}; +use glib::{DateTime, GString, Regex, RegexCompileFlags, RegexMatchFlags, TimeZone, Uri, UriFlags}; pub struct Link { pub alt: Option, // [optional] alternative link description diff --git a/src/line/list.rs b/src/line/list.rs index f2598e5..2aa1320 100644 --- a/src/line/list.rs +++ b/src/line/list.rs @@ -1,4 +1,4 @@ -use gtk::glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; +use glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; pub struct List { pub value: GString, diff --git a/src/line/quote.rs b/src/line/quote.rs index 20d69b6..c19c475 100644 --- a/src/line/quote.rs +++ b/src/line/quote.rs @@ -1,4 +1,4 @@ -use gtk::glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; +use glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags}; pub struct Quote { pub value: GString, diff --git a/tests/integration.rs b/tests/integration.rs index 475398a..bbfb5d8 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -6,7 +6,7 @@ use ggemtext::line::{ quote::Quote, }; -use gtk::glib::{TimeZone, Uri, UriFlags}; +use glib::{TimeZone, Uri, UriFlags}; use std::fs; #[test]