Merge pull request #1080 from mrcjkb/mj/push-uorxxkqtkrxu

fix: stop depending on unmaintained/unsound serde_yml

Author: CppCXY

Cargo.lock

@@ -31,7 +31,7 @@ fern = "0.7.1"
 chrono = "0.4.44"
 tokio-util = "0.7.16"
 walkdir = "2.5.0"
-serde_yml = "0.0.12"
+serde_yaml_ng = "0.10"
 dirs = "6"
 wax = "0.6.0"
 percent-encoding = "2.3"

Cargo.toml

@@ -19,7 +19,7 @@ serde.workspace = true
 emmylua_parser.workspace = true
 rowan.workspace = true
 serde_json.workspace = true
-serde_yml.workspace = true
+serde_yaml_ng.workspace = true
 toml_edit.workspace = true
 smol_str.workspace = true
 glob.workspace = true

crates/emmylua_formatter/Cargo.toml

@@ -256,7 +256,7 @@ pub fn parse_format_config(
                 message: err.to_string(),
             }
         }),
-        "yml" | "yaml" => serde_yml::from_str::<LuaFormatConfig>(content).map_err(|err| {
+        "yml" | "yaml" => serde_yaml_ng::from_str::<LuaFormatConfig>(content).map_err(|err| {
             FormatterError::ConfigParse {
                 path: path.map(Path::to_path_buf),
                 message: err.to_string(),
@@ -388,7 +388,7 @@ fn try_parse_unknown_config_format(
 ) -> Result<LuaFormatConfig, FormatterError> {
     from_toml_str::<LuaFormatConfig>(content)
         .or_else(|_| serde_json::from_str::<LuaFormatConfig>(content))
-        .or_else(|_| serde_yml::from_str::<LuaFormatConfig>(content))
+        .or_else(|_| serde_yaml_ng::from_str::<LuaFormatConfig>(content))
         .map_err(|err| FormatterError::ConfigParse {
             path: path.map(Path::to_path_buf),
             message: format!("unknown extension, failed to parse as TOML/JSON/YAML: {err}"),

crates/emmylua_formatter/src/workspace.rs

@@ -36,7 +36,7 @@ rowan.workspace = true
 walkdir.workspace = true
 rust-i18n.workspace = true
 glob.workspace = true
-serde_yml.workspace = true
+serde_yaml_ng.workspace = true
 itertools.workspace = true
 dirs.workspace = true
 wax.workspace = true

crates/emmylua_ls/Cargo.toml

@@ -215,13 +215,13 @@ fn translate_one_std_file(locale: &str, rel_lua_path: &Path, content: &str) -> O
 fn read_meta(path_in_dir: &str) -> Option<MetaFile> {
     let file = STD_I18N_DIR.get_file(path_in_dir)?;
     let raw = file.contents_utf8()?;
-    serde_yml::from_str(raw).ok()
+    serde_yaml_ng::from_str(raw).ok()
 }
 
 fn read_translations(path_in_dir: &str) -> Option<HashMap<String, String>> {
     let file = STD_I18N_DIR.get_file(path_in_dir)?;
     let raw = file.contents_utf8()?;
-    serde_yml::from_str(raw).ok()
+    serde_yaml_ng::from_str(raw).ok()
 }
 
 fn apply_meta_translations(
@@ -1214,7 +1214,7 @@ function coroutine.status(co) end
             .get_file("coroutine/meta.yaml")
             .expect("generated coroutine meta exists");
         let meta: MetaFile =
-            serde_yml::from_str(file.contents_utf8().expect("meta is utf8")).unwrap();
+            serde_yaml_ng::from_str(file.contents_utf8().expect("meta is utf8")).unwrap();
 
         assert_eq!(meta.v, 2);
         assert!(meta.b.iter().flat_map(|block| &block.e).any(|entry| {
@@ -1230,7 +1230,7 @@ function coroutine.status(co) end
             .get_file("coroutine/meta.yaml")
             .expect("generated coroutine meta exists");
         let meta: MetaFile =
-            serde_yml::from_str(file.contents_utf8().expect("meta is utf8")).unwrap();
+            serde_yaml_ng::from_str(file.contents_utf8().expect("meta is utf8")).unwrap();
         let source = emmylua_code_analysis::load_resource_from_include_dir()
             .into_iter()
             .find(|file| file.path == "std/coroutine.lua")

crates/emmylua_ls/src/handlers/initialized/std_i18n.rs

@@ -9,5 +9,5 @@ emmylua_parser.workspace = true
 
 # external
 serde.workspace = true
-serde_yml.workspace = true
+serde_yaml_ng.workspace = true
 walkdir.workspace = true

tools/std_i18n/Cargo.toml

@@ -69,7 +69,7 @@ fn read_yaml_string_map(
         return Ok(HashMap::new());
     }
     let raw = fs::read_to_string(path)?;
-    let map: HashMap<String, String> = serde_yml::from_str(&raw)?;
+    let map: HashMap<String, String> = serde_yaml_ng::from_str(&raw)?;
     Ok(map)
 }