Fix conflicts from rebase

Author: Nichol Yip

crates/spk-schema/src/metadata/meta.rs

@@ -16,7 +16,7 @@ use crate::{Error, Lint, LintedItem, Lints, Result, UnknownKey};
 #[path = "./meta_test.rs"]
 mod meta_test;
 
-#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
+#[derive(Default, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
 pub struct Meta {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
@@ -107,7 +107,7 @@ impl From<MetaVisitor> for Meta {
         Self {
             description: value.description,
             homepage: value.homepage,
-            license: value.license.unwrap_or(Meta::default_license()),
+            license: value.license,
             labels: value.labels.unwrap_or_default(),
         }
     }

crates/spk-schema/src/spec.rs

@@ -162,13 +162,8 @@ impl Template for SpecTemplate {
 
     fn render_to_string(&self, options: &OptionMap) -> Result<String> {
         let data = super::TemplateData::new(options);
-        let rendered = spk_schema_tera::render_template(
-            self.file_path.to_string_lossy(),
-            &self.template,
-            &data,
-        )
-        .map_err(Error::InvalidTemplate)?;
-        Ok(SpecRecipe::from_yaml(rendered)?)
+        spk_schema_tera::render_template(self.file_path.to_string_lossy(), &self.template, &data)
+            .map_err(Error::InvalidTemplate)
     }
 }
 

crates/spk-schema/src/v0/mod.rs

@@ -10,7 +10,6 @@ mod variant_spec;
 
 pub use platform::Platform;
 pub use spec::Spec;
-pub use spec::{LintedSpec, Spec};
 pub use test_spec::TestSpec;
 pub use variant::Variant;
 pub use variant_spec::VariantSpec;

crates/spk-schema/src/v0/spec.rs

@@ -14,7 +14,6 @@ use spk_schema_foundation::ident_build::BuildId;
 use spk_schema_foundation::ident_component::ComponentBTreeSet;
 use spk_schema_foundation::option_map::{OptFilter, Stringified};
 use spk_schema_foundation::version::IncompatibleReason;
-use spk_schema_foundation::option_map::Stringified;
 use spk_schema_ident::{AnyIdent, BuildIdent, Ident, RangeIdent, VersionIdent};
 use struct_field_names_as_array::FieldNamesAsArray;
 

crates/spk-schema/src/v0/test_spec.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // https://github.com/spkenv/spk
 
-use ngrammatic::CorpusBuilder;
 use serde::{Deserialize, Serialize};
 use spk_schema_foundation::option_map::Stringified;
 use struct_field_names_as_array::FieldNamesAsArray;