Revert to serde_yaml (#453)

Cargo.toml

@@ -29,7 +29,7 @@ cargo_metadata = "0.18.0"
 dialoguer = "0.10.2"
 path-clean = "1.0.1"
 regex = "1.6.0"
-serde_yml = "0.0.10"
+serde_yaml = "0.9.34"
 serde_json = "1"
 structopt = "0.3.11"
 thiserror = "1.0.22"

src/error.rs

@@ -16,9 +16,9 @@ pub enum ScaffoldError {
     #[error(transparent)]
     CargoMetadataError(#[from] cargo_metadata::Error),
 
-    /// serde_yml::Error
+    /// serde_yaml::Error
     #[error("YAML serialization error: {0}")]
-    SerdeYamlError(#[from] serde_yml::Error),
+    SerdeYamlError(#[from] serde_yaml::Error),
 
     #[error("JSON serialization error: {0}")]
     SerdeJsonError(#[from] serde_json::Error),

src/scaffold/app.rs

@@ -84,10 +84,10 @@ pub fn find_app_manifests(
     let manifests: BTreeMap<PathBuf, AppManifest> = files
         .into_iter()
         .map(|(key, manifest_str)| {
-            let manifest: AppManifest = serde_yml::from_str(manifest_str.as_str())?;
+            let manifest: AppManifest = serde_yaml::from_str(manifest_str.as_str())?;
             Ok((key, manifest))
         })
-        .collect::<serde_yml::Result<Vec<(PathBuf, AppManifest)>>>()?
+        .collect::<serde_yaml::Result<Vec<(PathBuf, AppManifest)>>>()?
         .into_iter()
         .collect();
 

src/scaffold/app/manifests.rs

@@ -20,7 +20,7 @@ pub fn empty_happ_manifest(
         .unwrap()
         .into();
 
-    let s = serde_yml::to_string(&manifest)?;
+    let s = serde_yaml::to_string(&manifest)?;
     Ok(s)
 }
 
@@ -41,6 +41,6 @@ pub fn web_happ_manifest<P: Into<PathBuf>>(
         .unwrap()
         .into();
 
-    let s = serde_yml::to_string(&manifest)?;
+    let s = serde_yaml::to_string(&manifest)?;
     Ok(s)
 }

src/scaffold/app/utils.rs

@@ -73,6 +73,6 @@ fn read_app_manifest(
     app_manifest_path: &Path,
 ) -> ScaffoldResult<AppManifest> {
     let content = file_content(app_file_tree, app_manifest_path)?;
-    let manifest: AppManifest = serde_yml::from_str(content.as_str())?;
+    let manifest: AppManifest = serde_yaml::from_str(content.as_str())?;
     Ok(manifest)
 }

src/scaffold/dna.rs

@@ -115,10 +115,10 @@ pub fn find_dna_manifests(
     let manifests: BTreeMap<PathBuf, DnaManifest> = files
         .into_iter()
         .map(|(key, manifest_str)| {
-            let manifest: DnaManifest = serde_yml::from_str(manifest_str.as_str())?;
+            let manifest: DnaManifest = serde_yaml::from_str(manifest_str.as_str())?;
             Ok((key, manifest))
         })
-        .collect::<serde_yml::Result<Vec<(PathBuf, DnaManifest)>>>()?
+        .collect::<serde_yaml::Result<Vec<(PathBuf, DnaManifest)>>>()?
         .into_iter()
         .collect();
 
@@ -147,7 +147,7 @@ pub fn read_dna_manifest(
     dna_manifest_path: &Path,
 ) -> ScaffoldResult<DnaManifest> {
     let contents = file_content(app_file_tree, dna_manifest_path)?;
-    let manifest: DnaManifest = serde_yml::from_str(contents.as_str())?;
+    let manifest: DnaManifest = serde_yaml::from_str(contents.as_str())?;
     Ok(manifest)
 }
 
@@ -240,7 +240,7 @@ pub fn scaffold_dna(
     insert_file(
         &mut file_tree,
         &app_manifest_path,
-        &serde_yml::to_string(&new_manifest)?,
+        &serde_yaml::to_string(&new_manifest)?,
     )?;
 
     insert_file_tree_in_dir(

src/scaffold/dna/coordinator.rs

@@ -46,7 +46,7 @@ pub fn add_coordinator_zome_to_manifest(
     insert_file(
         &mut dna_file_tree.file_tree,
         &dna_file_tree.dna_manifest_path,
-        &serde_yml::to_string(&new_manifest)?,
+        &serde_yaml::to_string(&new_manifest)?,
     )?;
 
     Ok(dna_file_tree)

src/scaffold/dna/integrity.rs

@@ -30,7 +30,7 @@ pub fn add_integrity_zome_to_manifest(
     insert_file(
         &mut file_tree,
         &dna_manifest_path,
-        &serde_yml::to_string(&new_manifest)?,
+        &serde_yaml::to_string(&new_manifest)?,
     )?;
 
     let dna_file_tree = DnaFileTree::from_dna_manifest_path(file_tree, &dna_manifest_path)?;

src/scaffold/dna/manifest.rs

@@ -21,7 +21,7 @@ pub fn empty_dna_manifest(dna_name: &str) -> ScaffoldResult<String> {
         .context("Failed to build DnaManifest")?
         .into();
 
-    let s = serde_yml::to_string(&manifest)?;
+    let s = serde_yaml::to_string(&manifest)?;
     Ok(s)
 }