Merge branch 'main' into k2v-watch-range-2

src/model/k2v/causality.rs

@@ -7,6 +7,7 @@
 //! "causality token", is used in the API and must be sent along with
 //! each write or delete operation to indicate the previously seen
 //! versions that we want to overwrite or delete.
+use base64::prelude::*;
 
 use std::collections::BTreeMap;
 use std::convert::TryInto;
@@ -67,13 +68,13 @@ impl CausalContext {
 			bytes.extend(u64::to_be_bytes(i));
 		}
 
-		base64::encode_config(bytes, base64::URL_SAFE_NO_PAD)
+		BASE64_URL_SAFE_NO_PAD.encode(bytes)
 	}
 
 	/// Parse from base64-encoded binary representation.
 	/// Returns None on error.
 	pub fn parse(s: &str) -> Option<Self> {
-		let bytes = base64::decode_config(s, base64::URL_SAFE_NO_PAD).ok()?;
+		let bytes = BASE64_URL_SAFE_NO_PAD.decode(s).ok()?;
 		if bytes.len() % 16 != 8 || bytes.len() < 8 {
 			return None;
 		}