Merge pull request #259 from marshallpierce/serprex-master

Fixes for #258

.circleci/config.yml

@@ -50,6 +50,12 @@ jobs:
       - run:
           name: Log rustc version
           command: rustc --version
+      - run:
+          name: Build main target
+          # update first to select dependencies appropriate for this toolchain
+          command: |
+            cargo update
+            cargo build
       - run:
           name: Check formatting
           command: |
@@ -64,9 +70,6 @@ jobs:
               rustup component add clippy
               cargo clippy --all-targets
             fi
-      - run:
-          name: Build main target
-          command: cargo build
       - run:
           name: Build all targets
           command: |

Cargo.toml

@@ -39,9 +39,9 @@ criterion = "0.4.0"
 rand = { version = "0.8.5", features = ["small_rng"] }
 structopt = "0.3.26"
 # test fixtures for engine tests
-rstest = "0.12.0"
-rstest_reuse = "0.3.0"
-lazy_static = "1.4.0"
+rstest = "0.13.0"
+rstest_reuse = "0.6.0"
+once_cell = "1"
 
 [features]
 default = ["std"]

src/alphabet.rs

@@ -38,17 +38,18 @@ const ALPHABET_SIZE: usize = 64;
 /// };
 /// ```
 ///
-/// Building a lazy_static:
+/// Building lazily:
 ///
 /// ```
 /// use base64::{
 ///     alphabet::Alphabet,
 ///     engine::{general_purpose::GeneralPurpose, GeneralPurposeConfig},
 /// };
+/// use once_cell::sync::Lazy;
 ///
-/// lazy_static::lazy_static! {
-///     static ref CUSTOM: Alphabet = Alphabet::new("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/").unwrap();
-/// }
+/// static CUSTOM: Lazy<Alphabet> = Lazy::new(||
+///     Alphabet::new("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/").unwrap()
+/// );
 /// ```
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Alphabet {