greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use dotenvy instead of dotenv (#1443)

Browse Source
This commit is contained in:
Mike Burns 2022-12-14 20:32:27 -08:00 committed by GitHub
parent eb924791ee
commit 8ef3148fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -173,10 +173,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]] [[package]]
name = "dotenv" name = "dotenvy"
version = "0.15.0" version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0"
[[package]] [[package]]
name = "edit-distance" name = "edit-distance"
@ -312,7 +312,7 @@ dependencies = [
"cradle", "cradle",
"ctrlc", "ctrlc",
"derivative", "derivative",
"dotenv", "dotenvy",
"edit-distance", "edit-distance",
"env_logger", "env_logger",
"executable-path", "executable-path",

2
Cargo.toml
View File

@ -23,7 +23,7 @@ camino = "1.0.4"
clap = { version = "2.33.0", features = ["wrap_help"] } clap = { version = "2.33.0", features = ["wrap_help"] }
ctrlc = { version = "3.1.1", features = ["termination"] } ctrlc = { version = "3.1.1", features = ["termination"] }
derivative = "2.0.0" derivative = "2.0.0"
dotenv = "0.15.0" dotenvy = "0.15"
edit-distance = "2.0.0" edit-distance = "2.0.0"
env_logger = "0.9.3" env_logger = "0.9.3"
heck = "0.4.0" heck = "0.4.0"

6
src/error.rs
View File

@ -62,7 +62,7 @@ pub(crate) enum Error<'src> {
min_arguments: usize, min_arguments: usize,
}, },
Dotenv { Dotenv {
dotenv_error: dotenv::Error, dotenv_error: dotenvy::Error,
}, },
DumpJson { DumpJson {
serde_json_error: serde_json::Error, serde_json_error: serde_json::Error,
@ -192,8 +192,8 @@ impl<'src> From<ConfigError> for Error<'src> {
} }
} }
impl<'src> From<dotenv::Error> for Error<'src> { impl<'src> From<dotenvy::Error> for Error<'src> {
fn from(dotenv_error: dotenv::Error) -> Error<'src> { fn from(dotenv_error: dotenvy::Error) -> Error<'src> {
Self::Dotenv { dotenv_error } Self::Dotenv { dotenv_error }
} }
} }

6
src/load_dotenv.rs
View File

@ -35,11 +35,7 @@ pub(crate) fn load_dotenv(
} }
fn load_from_file(path: &Path) -> RunResult<'static, BTreeMap<String, String>> { fn load_from_file(path: &Path) -> RunResult<'static, BTreeMap<String, String>> {
// `dotenv::from_path_iter` should eventually be un-deprecated, see: let iter = dotenvy::from_path_iter(path)?;
// https://github.com/dotenv-rs/dotenv/issues/13
#![allow(deprecated)]
let iter = dotenv::from_path_iter(path)?;
let mut dotenv = BTreeMap::new(); let mut dotenv = BTreeMap::new();
for result in iter { for result in iter {
let (key, value) = result?; let (key, value) = result?;