diff --git a/Cargo.lock b/Cargo.lock index 60243d3..bf4bb67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + [[package]] name = "aho-corasick" version = "1.0.4" @@ -145,9 +154,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" dependencies = [ "cfg-if", "hashbrown", @@ -201,11 +210,11 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.13" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -359,7 +368,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -545,16 +553,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -570,7 +568,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.4", "memchr", "regex-automata 0.3.6", "regex-syntax 0.7.4", @@ -591,7 +589,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.4", "memchr", "regex-syntax 0.7.4", ] @@ -631,15 +629,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -740,10 +738,8 @@ dependencies = [ "dashmap", "lazy_static", "rand", - "rand_distr", "regex", "serde", - "serde_json", "tera", "thiserror", "tracing", diff --git a/README.md b/README.md index 83d0106..57c41df 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# tera-rand   [![build status]][actions] [![rustc Version 1.64+]][rustc] +# tera-rand   [![build status]][actions] [![rustc Version 1.65+]][rustc] tera-rand is a suite of random data generation functions for the [Tera] template engine. [build status]: https://img.shields.io/github/actions/workflow/status/philosobyte/tera-rand/ci.yml?branch=main [actions]: https://github.com/philosobyte/tera-rand/actions?query=branch%3Amain [Tera]: https://github.com/Keats/tera -[rustc Version 1.64+]: https://img.shields.io/badge/rustc-1.64+-lightgray.svg -[rustc]: https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html +[rustc Version 1.65+]: https://img.shields.io/badge/rustc-1.65+-lightgray.svg +[rustc]: https://blog.rust-lang.org/2022/09/22/Rust-1.65.0.html diff --git a/tera-rand/Cargo.toml b/tera-rand/Cargo.toml index ebed0c4..b2a0aff 100644 --- a/tera-rand/Cargo.toml +++ b/tera-rand/Cargo.toml @@ -1,28 +1,32 @@ [package] name = "tera-rand" version = "0.1.0" +authors = ["Raymond Liu "] +categories = ["template-engine",] +description = "A suite of random data generation functions for the Tera template engine" edition = "2021" -rust-version = "1.65" +keywords = ["fake",] license = "MIT OR Apache-2.0" +repository = "https://github.com/Philosobyte/tera-rand" +rust-version = "1.65" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -thiserror = "1.0.40" -anyhow = "1.0.71" -dashmap = "5.4.0" -lazy_static = "1.4.0" -tracing = "0.1.37" -tracing-subscriber = "0.3.17" -tracing-test = "0.2.4" -rand = "0.8.5" -rand_distr = { version = "0.4.3", optional = true } -regex = "1.8.1" -tera = "1.18.1" +anyhow = "=1.0.75" +dashmap = "=5.5.1" +lazy_static = "=1.4.0" +rand = "=0.8.5" +serde = "=1.0.185" +tera = "=1.19.0" +thiserror = "=1.0.47" +uuid = { version = "=1.4.1", features = ["v4"], optional = true } -serde = { version = "1.0.162" } -serde_json = "1.0.96" -uuid = { version = "1.3.2", features = ["v4"], optional = true } +[dev-dependencies] +regex = "=1.9.3" +tracing = "=0.1.37" +tracing-subscriber = "=0.3.17" +tracing-test = "=0.2.4" [features] -default = ["uuid", "rand_distr"] +default = ["uuid",] diff --git a/tera-rand/src/file.rs b/tera-rand/src/file.rs index c088255..86a212c 100644 --- a/tera-rand/src/file.rs +++ b/tera-rand/src/file.rs @@ -8,7 +8,6 @@ use std::collections::HashMap; use std::fs::File; use std::io::{BufRead, BufReader}; use tera::{to_value, Result, Value}; -use tracing::trace; lazy_static! { static ref FILE_CACHE: DashMap> = DashMap::new(); @@ -47,7 +46,6 @@ pub fn random_from_file(args: &HashMap) -> Result { for line_result in buf_reader.lines() { let line: String = line_result .map_err(|source| read_file_error("random_from_file", filepath.clone(), source))?; - trace!(line); file_values.push(line); } @@ -61,7 +59,6 @@ pub fn random_from_file(args: &HashMap) -> Result { match possible_values_opt { Some(reference) => { let possible_values: &Vec = reference.value(); - trace!("possible_values: {possible_values:?}"); let index_to_sample: usize = thread_rng().gen_range(0usize..possible_values.len()); match possible_values.get(index_to_sample) { diff --git a/tera-rand/src/net.rs b/tera-rand/src/net.rs index 3d0f750..39de65e 100644 --- a/tera-rand/src/net.rs +++ b/tera-rand/src/net.rs @@ -3,7 +3,6 @@ use rand::{thread_rng, Rng}; use std::collections::HashMap; use std::net::{Ipv4Addr, Ipv6Addr}; use tera::{to_value, Result, Value}; -use tracing::trace; /// A Tera function to generate a random IPv4 address. /// @@ -162,7 +161,6 @@ pub fn random_ipv4_cidr(args: &HashMap) -> Result { let random_prefix_length: u32 = thread_rng().gen_range(length_start..=length_end); let bits_to_shift: u32 = u32::BITS - random_prefix_length; - trace!("random_prefix_length: {random_prefix_length}, bits_to_shift: {bits_to_shift}, random_addr: {random_addr}"); let random_prefix: u32 = match bits_to_shift { u32::BITS => 0u32, @@ -227,7 +225,6 @@ pub fn random_ipv6_cidr(args: &HashMap) -> Result { let random_prefix_length: u32 = thread_rng().gen_range(length_start..=length_end); let bits_to_shift: u32 = u128::BITS - random_prefix_length; - trace!("random_prefix_length: {random_prefix_length}, bits_to_shift: {bits_to_shift}, random_addr: {random_addr}"); let random_prefix: u128 = match bits_to_shift { u128::BITS => 0u128,