detect singular

Author: ss2165

hugr-cli/src/describe.rs

@@ -101,11 +101,17 @@ impl DescribeArgs {
 
     fn print_description(&mut self, desc: PackageDesc) -> Result<()> {
         let header = desc.header();
+        let n_modules = desc.n_modules();
+        let n_extensions = desc.n_packaged_extensions();
+        let module_str = if n_modules == 1 { "module" } else { "modules" };
+        let extension_str = if n_extensions == 1 {
+            "extension"
+        } else {
+            "extensions"
+        };
         writeln!(
             self.output,
-            "{header}\nPackage contains {} module(s) and {} extension(s)",
-            desc.n_modules(),
-            desc.n_packaged_extensions()
+            "{header}\nPackage contains {n_modules} {module_str} and {n_extensions} {extension_str}",
         )?;
         let summaries: Vec<ModuleSummary> = desc
             .modules

hugr-cli/tests/describe.rs

@@ -140,7 +140,7 @@ fn test_describe_basic(empty_package_file: NamedTempFile, mut describe_cmd: Comm
     describe_cmd
         .assert()
         .success()
-        .stdout(contains("Package contains 0 module(s) and 0 extension(s)"));
+        .stdout(contains("Package contains 0 modules and 0 extensions"));
 }
 
 #[rstest]
@@ -213,7 +213,7 @@ fn test_describe_output_redirection(empty_package_file: NamedTempFile, mut descr
         output_file.path(),
     ]);
     describe_cmd.assert().success();
-    output_file.assert(contains("Package contains 0 module(s) and 0 extension(s)"));
+    output_file.assert(contains("Package contains 0 modules and 0 extensions"));
 }
 
 #[rstest]