From a3cf104736b9d5340fd5f4c1e72ac16e478a98f6 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Tue, 11 Apr 2023 15:55:39 +0200 Subject: [PATCH] Fix the compilation --- meilisearch-auth/src/lib.rs | 3 ++- meilisearch/src/option.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meilisearch-auth/src/lib.rs b/meilisearch-auth/src/lib.rs index 05f320dfb..2a02776bd 100644 --- a/meilisearch-auth/src/lib.rs +++ b/meilisearch-auth/src/lib.rs @@ -310,6 +310,7 @@ pub const MASTER_KEY_MIN_SIZE: usize = 16; const MASTER_KEY_GEN_SIZE: usize = 32; pub fn generate_master_key() -> String { + use base64::Engine; use rand::rngs::OsRng; use rand::RngCore; @@ -320,5 +321,5 @@ pub fn generate_master_key() -> String { // let's encode the random bytes to base64 to make them human-readable and not too long. // We're using the URL_SAFE alphabet that will produce keys without =, / or other unusual characters. - base64::encode_config(buf, base64::URL_SAFE_NO_PAD) + base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(buf) } diff --git a/meilisearch/src/option.rs b/meilisearch/src/option.rs index 563bc3496..8e6ca9006 100644 --- a/meilisearch/src/option.rs +++ b/meilisearch/src/option.rs @@ -323,10 +323,10 @@ impl Opt { .clone() .unwrap_or_else(|| PathBuf::from(DEFAULT_CONFIG_FILE_PATH)); - match std::fs::read(&config_file_path) { + match std::fs::read_to_string(&config_file_path) { Ok(config) => { // If the file is successfully read, we deserialize it with `toml`. - let opt_from_config = toml::from_slice::(&config)?; + let opt_from_config = toml::from_str::(&config)?; // Return an error if config file contains 'config_file_path' // Using that key in the config file doesn't make sense bc it creates a logical loop (config file referencing itself) if opt_from_config.config_file_path.is_some() {