Use deprecated serde_yaml in cli (#684)

mitsuhiko · Jan 27, 2025 · 9b357f9 · 9b357f9
1 parent c941c0b
commit 9b357f9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to MiniJinja are documented here.
   it now ensures that the iterator is not running "one item ahead".  #677
 - Fixed an issue that caused loop aliasing not to be supported for
   recursive loops.  #678
+- CLI moved from `serde_yml` to `serde_yaml`.  #684
 
 ## 2.6.0
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/minijinja-cli/Cargo.toml b/minijinja-cli/Cargo.toml
@@ -13,7 +13,7 @@ rust-version = "1.65"
 
 [features]
 default = ["toml", "yaml", "querystring", "cbor", "datetime", "json5", "repl", "completions", "unicode", "ini", "contrib", "preserve_order"]
-yaml = ["serde_yml"]
+yaml = ["serde_yaml"]
 querystring = ["serde_qs"]
 cbor = ["ciborium"]
 datetime = ["minijinja-contrib/datetime", "minijinja-contrib/timezone"]
@@ -52,7 +52,7 @@ serde = { version = "1.0.183", features = ["derive", "rc"] }
 serde_json = "1.0.105"
 serde_json5 = { version = "0.1.0", optional = true }
 serde_qs = { version = "0.12.0", optional = true }
-serde_yml = { version = "0.0.10", optional = true }
+serde_yaml = { version = "0.9.34", optional = true }
 tempfile = "3.9.0"
 toml = { version = "0.7.6", optional = true }
 clap_complete = { version = "4", optional = true }

diff --git a/minijinja-cli/src/cli.rs b/minijinja-cli/src/cli.rs
@@ -101,9 +101,9 @@ fn load_data(
         #[cfg(feature = "yaml")]
         "yaml" => {
             // for merge keys to work we need to manually call `apply_merge`.
-            // For this reason we need to deserialize into a serde_yml::Value
+            // For this reason we need to deserialize into a serde_yaml::Value
             // before converting it into a final value.
-            let mut v: serde_yml::Value = serde_yml::from_slice(&contents)?;
+            let mut v: serde_yaml::Value = serde_yaml::from_slice(&contents)?;
             v.apply_merge()?;
             Value::from_serialize(v)
         }

diff --git a/minijinja-cli/src/config.rs b/minijinja-cli/src/config.rs
@@ -334,7 +334,7 @@ fn interpret_raw_value(s: &str) -> Result<Value, Error> {
     }
     #[cfg(feature = "yaml")]
     mod imp {
-        pub use serde_yml::from_str;
+        pub use serde_yaml::from_str;
         pub const FMT: &str = "JSON";
     }
     imp::from_str::<Value>(s)