diff --git a/Cargo.toml b/Cargo.toml index dfeb3cf..d356bb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "flakeid" version = "0.1.0" authors = ["Anton Österberg "] -edition = "2021" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/generate.rs b/examples/generate.rs index 594c3fe..ace64a7 100644 --- a/examples/generate.rs +++ b/examples/generate.rs @@ -1,8 +1,8 @@ -use flakeid::gen::FlakeGen; +use flakeid::generator::FlakeGen; fn main() { - let mut gen = FlakeGen::with_mac_addr().expect("Unable to create generator"); - let id = gen.next().expect("Unable to generate ID"); + let mut generator = FlakeGen::with_mac_addr().expect("Unable to create generator"); + let id = generator.next().expect("Unable to generate ID"); println!("{:<8}: {id:b}", "binary"); println!("{:<8}: {}", "decimal", id.value()); println!("{:<8}: {id:x}", "hex"); diff --git a/src/gen.rs b/src/generator.rs similarity index 87% rename from src/gen.rs rename to src/generator.rs index 35684cd..c8d13f6 100644 --- a/src/gen.rs +++ b/src/generator.rs @@ -16,9 +16,9 @@ impl FlakeGen { /// generator of Flake IDs. /// ``` /// use flakeid::id::Flake; - /// use flakeid::gen::FlakeGen; - /// let mut gen = FlakeGen::new(0xC0FEE); - /// let id: Flake = gen.next().expect("No ID was generated"); + /// use flakeid::generator::FlakeGen; + /// let mut generator = FlakeGen::new(0xC0FEE); + /// let id: Flake = generator.next().expect("No ID was generated"); /// ``` pub fn new(node_id: u64) -> FlakeGen { FlakeGen { @@ -31,9 +31,9 @@ impl FlakeGen { /// The creation may fail if it is not possible to resolve a MAC address for this host. /// ``` /// use flakeid::id::Flake; - /// use flakeid::gen::FlakeGen; - /// let mut gen = FlakeGen::with_mac_addr().expect("Creating generator failed"); - /// let id: Flake = gen.next().expect("No ID was generated"); + /// use flakeid::generator::FlakeGen; + /// let mut generator = FlakeGen::with_mac_addr().expect("Creating generator failed"); + /// let id: Flake = generator.next().expect("No ID was generated"); /// ``` pub fn with_mac_addr() -> Result { let mac_addr: MacAddress = get_mac_address()?.ok_or(FlakeGenErr::NoMacAddr)?; @@ -112,7 +112,7 @@ pub enum FlakeErr { #[cfg(test)] mod tests { - use crate::gen::FlakeGen; + use crate::generator::FlakeGen; use crate::id::Flake; #[quickcheck] @@ -162,17 +162,17 @@ mod tests { #[test] fn two_ids_are_not_same() { - let mut gen = FlakeGen::with_mac_addr().unwrap(); - let id1: Flake = gen.next().unwrap(); - let id2: Flake = gen.next().unwrap(); + let mut generator = FlakeGen::with_mac_addr().unwrap(); + let id1: Flake = generator.next().unwrap(); + let id2: Flake = generator.next().unwrap(); assert_ne!(id1, id2); } #[test] fn test_first_id_less_than_second() { - let mut gen = FlakeGen::with_mac_addr().unwrap(); - let id1: Flake = gen.next().unwrap(); - let id2: Flake = gen.next().unwrap(); + let mut generator = FlakeGen::with_mac_addr().unwrap(); + let id1: Flake = generator.next().unwrap(); + let id2: Flake = generator.next().unwrap(); assert!(id1 < id2); assert!(id2 > id1); } diff --git a/src/lib.rs b/src/lib.rs index 44297fb..bd17417 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,7 @@ extern crate serde_test; #[macro_use(quickcheck)] extern crate quickcheck_macros; -pub mod gen; +pub mod generator; pub mod id; mod seq; diff --git a/src/seq.rs b/src/seq.rs index cead927..a1adec3 100644 --- a/src/seq.rs +++ b/src/seq.rs @@ -1,6 +1,6 @@ use std::time::{Duration, SystemTime}; -use crate::gen::FlakeErr; +use crate::generator::FlakeErr; #[derive(Default)] pub(crate) struct SeqGen {