Merge branch 'master' of github.com:mantono/flakeid into docs/bit-shift-count

Author: mantono

Cargo.toml

@@ -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
 

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");

src/gen.rs src/generator.rssrc/gen.rs renamed to 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<FlakeGen, FlakeGenErr> {
         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);
     }

src/id.rs

@@ -86,7 +86,7 @@ impl UpperHex for Flake {
 
 impl Display for Flake {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&BASE64.encode(&self.0.to_be_bytes()))
+        f.write_str(&BASE64.encode(&self.0.to_le_bytes()))
     }
 }
 

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;
 

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 {

src/serde.rs

@@ -47,7 +47,7 @@ impl<'de> Visitor<'de> for FlakeVisitor {
         for (i, byte) in decoded_bytes.iter().take(bytes.len()).enumerate() {
             bytes[i] = *byte;
         }
-        let value = u128::from_be_bytes(bytes);
+        let value = u128::from_le_bytes(bytes);
         Ok(Flake::new(value))
     }
 
@@ -62,5 +62,5 @@ impl<'de> Visitor<'de> for FlakeVisitor {
 #[test]
 fn test_serde() {
     let id = Flake::new(29866156537351941961353716432896);
-    assert_tokens(&id, &[Token::String("AAABePbBqL900Cue9CYAAA==")]);
+    assert_tokens(&id, &[Token::String("AAAm9J4r0HS/qMH2eAEAAA==")]);
 }