Removed dead commented code and fixed du test with the correct sizes.

Signed-off-by: Nichol Yip <[email protected]>

Author: Nichol Yip

Cargo.lock

@@ -72,7 +72,7 @@ async fn test_du_trivially_works() {
 
     let mut expected_output = vec![
         "2local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
-        "160local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
+        "82local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.cmpt",
         "17local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.sh",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
@@ -343,7 +343,7 @@ async fn test_du_summarize_output_enabled() {
     let mut opt = Opt::try_parse_from(["du", "local/my-pkg", "-s"]).unwrap();
     opt.du.run().await.unwrap();
 
-    let expected_output = format!("179local/my-pkg/{}", "".red());
+    let expected_output = format!("101local/my-pkg/{}", "".red());
     let mut generated_output = opt.du.output.vec.lock().unwrap()[0].clone();
     generated_output.retain(|c| !c.is_whitespace());
 
@@ -382,7 +382,7 @@ async fn test_du_summarize_output_is_not_enabled() {
         "2local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
         "0local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.cmpt",
         "17local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.sh",
-        "160local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
+        "82local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/run.cmpt",
@@ -440,7 +440,7 @@ async fn test_deprecate_flag() {
 
     let mut opt_with_deprecate_flag = Opt::try_parse_from(["du", "local/my-pkg", "-ds"]).unwrap();
     opt_with_deprecate_flag.du.run().await.unwrap();
-    let expected_output = format!("196local/my-pkg/{}", "DEPRECATED".red());
+    let expected_output = format!("118local/my-pkg/{}", "DEPRECATED".red());
     let mut generated_output = opt_with_deprecate_flag.du.output.vec.lock().unwrap()[0].clone();
     generated_output.retain(|c| !c.is_whitespace());
     assert_eq!(expected_output, generated_output);

crates/spk-cli/cmd-du/src/cmd_du_test.rs

@@ -176,12 +176,6 @@ impl OptName {
         unsafe { Self::from_str("distro") }
     }
 
-    /// Standard option used to identify unrecognized keys for linting
-    pub const fn unrecognized_key() -> &'static Self {
-        // Safety: from_str skips validation, but this is a known good value
-        unsafe { Self::from_str("unrecognized_key") }
-    }
-
     /// Validate the given string as an option name
     pub fn validate<S: AsRef<str> + ?Sized>(s: &S) -> Result<()> {
         validate_opt_name(s)

crates/spk-schema/crates/foundation/src/name/mod.rs

@@ -16,7 +16,6 @@ format_serde_error = { version = "0.3", default_features = false, features = [
     "colored",
 ] }
 itertools = "0.10"
-ngrammatic = "0.4.0"
 nom = { workspace = true }
 nom-supreme = { workspace = true }
 relative-path = "1.3"

crates/spk-schema/crates/ident/Cargo.toml

@@ -337,18 +337,6 @@ impl<'de> Deserialize<'de> for Request {
     }
 }
 
-/// Stores the error message of the unrecognized key
-#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct UnrecognizedKey {
-    pub error: String,
-}
-
-impl std::fmt::Display for UnrecognizedKey {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        f.write_fmt(format_args!("{self:?}"))
-    }
-}
-
 /// A set of restrictions placed on selected packages' build options.
 #[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct VarRequest<T = PinnableValue> {

crates/spk-schema/crates/ident/src/request.rs

@@ -163,13 +163,6 @@ impl Template for SpecTemplate {
             .map_err(Error::InvalidTemplate)?;
         Ok(SpecRecipe::from_yaml(rendered)?)
     }
-
-    // fn render_lint(&self, options: &OptionMap) -> Result<Self::Output> {
-    //     let data = super::TemplateData::new(options);
-    //     let rendered = spk_schema_liquid::render_template(&self.template, &data)
-    //         .map_err(Error::InvalidTemplate)?;
-    //     Ok(SpecRecipe::from_yaml(rendered)?)
-    // }
 }
 
 impl TemplateExt for SpecTemplate {
@@ -230,29 +223,6 @@ impl TemplateExt for SpecTemplate {
     }
 }
 
-// #[derive(Debug, Clone, Hash, Eq, PartialEq, Serialize)]
-// // #[enum_dispatch(Deprecate, DeprecateMut)]
-// pub enum SpecRecipeKind {
-//     DefaultSpec(super::v0::Spec<VersionIdent>),
-//     LintSpec(super::v0::LintedSpec<VersionIdent>)
-// }
-
-// impl SpecRecipeKind {
-//     pub fn spec(&self) -> &super::v0::Spec<VersionIdent> {
-//         match self {
-//             SpecRecipeKind::DefaultSpec(s) => s,
-//             SpecRecipeKind::LintSpec(lint) => &lint.spec,
-//         }
-//     }
-
-//     pub fn lints(&self) -> Vec<String> {
-//         match self {
-//             SpecRecipeKind::DefaultSpec(_) => Vec::default(),
-//             SpecRecipeKind::LintSpec(lint) => lint.lints.clone(),
-//         }
-//     }
-// }
-
 /// Specifies some buildable object within the spk ecosystem.
 ///
 /// All build-able types have a recipe representation

crates/spk-schema/src/spec.rs

@@ -992,6 +992,13 @@ where
             .as_ref()
             .ok_or_else(|| serde::de::Error::missing_field("pkg"))?;
 
+        // if self.check_build_spec {
+        //     if let Some(build_spec) = self.build {
+        //         let unchecked_build_spec: UncheckedBuildSpec = build_spec.item;
+        //         unchecked_build_spec.try_into().map_err(serde::de::Error::custom)?;
+        //     }
+        // }
+
         Ok(self)
         // let pkg = self
         //     .pkg