Skip to content

Commit

Permalink
regex as optional dep
Browse files Browse the repository at this point in the history
JieningYu committed Feb 23, 2024
1 parent 5f1b79e commit e39196d
Showing 5 changed files with 22 additions and 6 deletions.
4 changes: 1 addition & 3 deletions crates/core/block/Cargo.toml
Original file line number Diff line number Diff line change
@@ -14,14 +14,12 @@ maintenance = { status = "passively-maintained" }
[dependencies]
rimecraft-registry = { path = "../registry" }
glam = "0.25"
rimecraft-state = { path = "../state", optional = true }
rimecraft-state = { path = "../state" }
rimecraft-edcode = { path = "../../util/edcode", optional = true }
serde = { version = "1.0", optional = true }

[features]
default = ["state"]
serde = ["dep:serde"]
state = ["dep:rimecraft-state"]
edcode = ["dep:rimecraft-edcode"]

[lints]
7 changes: 6 additions & 1 deletion crates/core/state/Cargo.toml
Original file line number Diff line number Diff line change
@@ -12,11 +12,16 @@ categories = []
maintenance = { status = "passively-maintained" }

[dependencies]
regex = "1.10"
regex = { version = "1.10", optional = true }
serde = { version = "1.0", optional = true }

[features]
serde = ["dep:serde"]
# use `regex` crate instead of `regex-lite`.
regex = ["dep:regex"]

[target.'cfg(not(feature = "regex"))'.dependencies]
regex-lite = "0.1"

[lints]
workspace = true
4 changes: 4 additions & 0 deletions crates/core/state/src/lib.rs
Original file line number Diff line number Diff line change
@@ -12,7 +12,11 @@ use std::{
};

use property::{BiIndex, ErasedProperty, Property, Wrap};

#[cfg(feature = "regex")]
use regex::Regex;
#[cfg(not(feature = "regex"))]
use regex_lite::Regex;

use crate::property::ErasedWrap;

7 changes: 6 additions & 1 deletion crates/util/fmt/Cargo.toml
Original file line number Diff line number Diff line change
@@ -14,10 +14,15 @@ maintenance = { status = "passively-maintained" }
[dependencies]
serde = { version = "1.0", features = ["derive"], optional = true }
rgb = "0.8"
regex = "1.10"
regex = { version = "1.10", optional = true }

[features]
serde = ["dep:serde"]
# use `regex` crate instead of `regex-lite`.
regex = ["dep:regex"]

[target.'cfg(not(feature = "regex"))'.dependencies]
regex-lite = "0.1"

[lints]
workspace = true
6 changes: 5 additions & 1 deletion crates/util/fmt/src/lib.rs
Original file line number Diff line number Diff line change
@@ -2,9 +2,13 @@
use std::{fmt::Display, ops::Deref, sync::OnceLock};

use regex::Regex;
use rgb::RGB8;

#[cfg(feature = "regex")]
use regex::Regex;
#[cfg(not(feature = "regex"))]
use regex_lite::Regex;

/// Color index of a formatting.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct ColorIndex(pub Option<u32>);

0 comments on commit e39196d

Please sign in to comment.