Evaluate yaml-rust2

Cargo.toml

@@ -95,6 +95,7 @@ toml = "0.8"
 typed-arena = "2.0.2"
 unicode-segmentation = "1.10.1"
 void = "1"
+yaml-rust2 = "0.8.1"
 
 metrics = "0.21"
 metrics-util = "0.15"

core/Cargo.toml

@@ -54,6 +54,7 @@ sha2.workspace = true
 md-5.workspace = true
 unicode-segmentation.workspace = true
 indoc.workspace = true
+yaml-rust2.workspace = true
 
 termimad = { workspace = true, optional = true }
 ansi_term = { workspace = true, optional = true }

core/src/cache.rs

@@ -540,40 +540,8 @@ impl Cache {
                 .map(|t| (attach_pos(t), ParseErrors::default()))
                 .map_err(|err| ParseError::from_serde_json(err, file_id, &self.files)),
             InputFormat::Yaml => {
-                // YAML files can contain multiple documents. If there is only
-                // one we transparently deserialize it. If there are multiple,
-                // we deserialize the file as an array.
-                let de = serde_yaml::Deserializer::from_str(self.files.source(file_id));
-                let mut terms = de
-                    .map(|de| {
-                        RichTerm::deserialize(de)
-                            .map(attach_pos)
-                            .map_err(|err| (ParseError::from_serde_yaml(err, file_id)))
-                    })
-                    .collect::<Result<Vec<_>, _>>()?;
-
-                if terms.is_empty() {
-                    unreachable!(
-                        "serde always produces at least one document, \
-                        the empty string turns into `null`"
-                    )
-                } else if terms.len() == 1 {
-                    Ok((
-                        terms.pop().expect("we just checked the length"),
-                        ParseErrors::default(),
-                    ))
-                } else {
-                    Ok((
-                        attach_pos(
-                            Term::Array(
-                                Array::new(Rc::from(terms.into_boxed_slice())),
-                                Default::default(),
-                            )
-                            .into(),
-                        ),
-                        ParseErrors::default(),
-                    ))
-                }
+                let rt = crate::yaml::load(self.files.source(file_id), file_id).unwrap();
+                Ok((rt, ParseErrors::default()))
             }
             InputFormat::Toml => {
                 crate::serialize::toml_deser::from_str(self.files.source(file_id), file_id)

core/src/lib.rs

@@ -20,6 +20,7 @@ pub mod term;
 pub mod transform;
 pub mod typ;
 pub mod typecheck;
+pub mod yaml;
 
 pub(crate) mod metrics;