Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "flakeid"
version = "0.1.0"
authors = ["Anton Österberg <anton@42x.io>"]
edition = "2021"
edition = "2024"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
6 changes: 3 additions & 3 deletions examples/generate.rs
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
26 changes: 13 additions & 13 deletions src/gen.rs → src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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<FlakeGen, FlakeGenErr> {
let mac_addr: MacAddress = get_mac_address()?.ok_or(FlakeGenErr::NoMacAddr)?;
Expand Down Expand Up @@ -112,7 +112,7 @@ pub enum FlakeErr {

#[cfg(test)]
mod tests {
use crate::gen::FlakeGen;
use crate::generator::FlakeGen;
use crate::id::Flake;

#[quickcheck]
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/seq.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::time::{Duration, SystemTime};

use crate::gen::FlakeErr;
use crate::generator::FlakeErr;

#[derive(Default)]
pub(crate) struct SeqGen {
Expand Down
Loading