Merge remote-tracking branch 'origin/main' into acl/linking_prelims

Author: acl-cqc

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# Commits to ignore in blame output
+#
+# To configure git to use this file, run:
+# > git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Bump to rust edition 2024, and a bunch of automated lint fixes
+# https://github.com/CQCL/hugr/pull/2195
+16903a65294aede245a4c8bb2a07a4692a619769

.github/workflows/ci-rs.yml

@@ -19,7 +19,6 @@ env:
   CI: true # insta snapshots behave differently on ci
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
-  HUGR_TEST_SCHEMA: "1"
   # different strings for install action and feature name
   # adapted from https://github.com/TheDan64/inkwell/blob/master/.github/workflows/test.yml
   LLVM_VERSION: "14.0"

Cargo.toml

@@ -16,7 +16,7 @@ default-members = ["hugr", "hugr-core", "hugr-passes", "hugr-cli", "hugr-model"]
 
 [workspace.package]
 rust-version = "1.85"
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/CQCL/hugr"
 repository = "https://github.com/CQCL/hugr"
 license = "Apache-2.0"
@@ -31,11 +31,16 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 ] }
 
 missing_docs = "warn"
+
 [workspace.lints.clippy]
 # Unstable check, may cause false positives.
 # https://github.com/rust-lang/rust-clippy/issues/5112
 debug_assert_with_mut_call = "warn"
 
+# TODO: Reduce the size of error types.
+result_large_err = "allow"
+large_enum_variant = "allow"
+
 [workspace.dependencies]
 insta = { version = "1.42.2" }
 bitvec = "1.0.1"

hugr-cli/src/extensions.rs

@@ -28,7 +28,7 @@ impl ExtArgs {
     pub fn run_dump(&self, registry: &ExtensionRegistry) {
         let base_dir = &self.outdir;
 
-        for ext in registry.iter() {
+        for ext in registry {
             let mut path = base_dir.clone();
             for part in ext.name().split('.') {
                 path.push(part);

hugr-cli/src/hugr_io.rs

@@ -1,7 +1,7 @@
 //! Input/output arguments for the HUGR CLI.
 
 use clio::Input;
-use hugr::envelope::{read_envelope, EnvelopeError};
+use hugr::envelope::{EnvelopeError, read_envelope};
 use hugr::extension::ExtensionRegistry;
 use hugr::package::Package;
 use hugr::{Extension, Hugr};
@@ -43,7 +43,7 @@ impl HugrInputArgs {
     /// Read a hugr envelope from the input and return the package encoded
     /// within.
     ///
-    /// If [HugrInputArgs::hugr_json] is `true`, [HugrInputArgs::get_hugr] should be called instead as
+    /// If [`HugrInputArgs::hugr_json`] is `true`, [`HugrInputArgs::get_hugr`] should be called instead as
     /// reading the input as a package will fail.
     pub fn get_package(&mut self) -> Result<Package, CliError> {
         let extensions = self.load_extensions()?;
@@ -58,9 +58,9 @@ impl HugrInputArgs {
     /// Read a hugr JSON file from the input.
     ///
     /// This is a legacy option for reading old HUGR JSON files when the
-    /// [HugrInputArgs::hugr_json] flag is used.
+    /// [`HugrInputArgs::hugr_json`] flag is used.
     ///
-    /// For most cases, [HugrInputArgs::get_package] should be called instead.
+    /// For most cases, [`HugrInputArgs::get_package`] should be called instead.
     pub fn get_hugr(&mut self) -> Result<Hugr, CliError> {
         let extensions = self.load_extensions()?;
         let mut buffer = BufReader::new(&mut self.input);
@@ -79,8 +79,8 @@ impl HugrInputArgs {
 
     /// Return a register with the selected extensions.
     ///
-    /// This includes the standard extensions if [HugrInputArgs::no_std] is `false`,
-    /// and the extensions loaded from the paths in [HugrInputArgs::extensions].
+    /// This includes the standard extensions if [`HugrInputArgs::no_std`] is `false`,
+    /// and the extensions loaded from the paths in [`HugrInputArgs::extensions`].
     pub fn load_extensions(&self) -> Result<ExtensionRegistry, CliError> {
         let mut reg = if self.no_std {
             hugr::extension::PRELUDE_REGISTRY.to_owned()

hugr-cli/src/lib.rs

@@ -56,7 +56,7 @@
 //!   [INPUT]                    Input file. Defaults to `-` for stdin.
 //! ```
 
-use clap::{crate_version, Parser};
+use clap::{Parser, crate_version};
 use clap_verbosity_flag::log::Level;
 use clap_verbosity_flag::{InfoLevel, Verbosity};
 use hugr::envelope::EnvelopeError;
@@ -119,6 +119,7 @@ pub struct OtherArgs {
 
 impl OtherArgs {
     /// Test whether a `level` message should be output.
+    #[must_use]
     pub fn verbosity(&self, level: Level) -> bool {
         self.verbose.log_level_filter() >= level
     }

hugr-cli/src/main.rs

@@ -2,7 +2,7 @@
 
 use clap::Parser as _;
 
-use hugr_cli::{mermaid, validate, CliArgs};
+use hugr_cli::{CliArgs, mermaid, validate};
 
 use clap_verbosity_flag::log::Level;
 
@@ -22,7 +22,7 @@ fn main() {
             eprintln!("Unknown command");
             std::process::exit(1);
         }
-    };
+    }
 }
 
 /// Run the `validate` subcommand.
@@ -31,7 +31,7 @@ fn run_validate(mut args: validate::ValArgs) {
 
     if let Err(e) = result {
         if args.verbosity(Level::Error) {
-            eprintln!("{}", e);
+            eprintln!("{e}");
         }
         std::process::exit(1);
     }
@@ -43,7 +43,7 @@ fn run_mermaid(mut args: mermaid::MermaidArgs) {
 
     if let Err(e) = result {
         if args.other_args.verbosity(Level::Error) {
-            eprintln!("{}", e);
+            eprintln!("{e}");
         }
         std::process::exit(1);
     }

hugr-cli/src/mermaid.rs

@@ -4,11 +4,11 @@ use std::io::Write;
 use clap::Parser;
 use clap_verbosity_flag::log::Level;
 use clio::Output;
-use hugr::package::PackageValidationError;
 use hugr::HugrView;
+use hugr::package::PackageValidationError;
 
-use crate::hugr_io::HugrInputArgs;
 use crate::OtherArgs;
+use crate::hugr_io::HugrInputArgs;
 
 /// Dump the standard extensions.
 #[derive(Parser, Debug)]
@@ -39,9 +39,10 @@ pub struct MermaidArgs {
 impl MermaidArgs {
     /// Write the mermaid diagram to the output.
     pub fn run_print(&mut self) -> Result<(), crate::CliError> {
-        match self.input_args.hugr_json {
-            true => self.run_print_hugr(),
-            false => self.run_print_envelope(),
+        if self.input_args.hugr_json {
+            self.run_print_hugr()
+        } else {
+            self.run_print_envelope()
         }
     }
 
@@ -73,6 +74,7 @@ impl MermaidArgs {
     }
 
     /// Test whether a `level` message should be output.
+    #[must_use]
     pub fn verbosity(&self, level: Level) -> bool {
         self.other_args.verbosity(level)
     }

hugr-cli/src/validate.rs

@@ -30,28 +30,26 @@ pub const VALID_PRINT: &str = "HUGR valid!";
 impl ValArgs {
     /// Run the HUGR cli and validate against an extension registry.
     pub fn run(&mut self) -> Result<Vec<Hugr>, CliError> {
-        let result = match self.input_args.hugr_json {
-            true => {
-                let hugr = self.input_args.get_hugr()?;
-                hugr.validate()
-                    .map_err(PackageValidationError::Validation)?;
-                vec![hugr]
-            }
-            false => {
-                let package = self.input_args.get_package()?;
-                package.validate()?;
-                package.modules
-            }
+        let result = if self.input_args.hugr_json {
+            let hugr = self.input_args.get_hugr()?;
+            hugr.validate()
+                .map_err(PackageValidationError::Validation)?;
+            vec![hugr]
+        } else {
+            let package = self.input_args.get_package()?;
+            package.validate()?;
+            package.modules
         };
 
         if self.verbosity(Level::Info) {
-            eprintln!("{}", VALID_PRINT);
+            eprintln!("{VALID_PRINT}");
         }
 
         Ok(result)
     }
 
     /// Test whether a `level` message should be output.
+    #[must_use]
     pub fn verbosity(&self, level: Level) -> bool {
         self.other_args.verbosity(level)
     }

hugr-cli/tests/gen_extensions.rs

@@ -36,7 +36,7 @@ fn test_extension_dump(mut cmd: Command) {
         "collections/list.json",
     ];
     // check all paths exist
-    for path in expected_paths.iter() {
+    for path in &expected_paths {
         let full_path = temp_dir.join(path);
         assert!(full_path.exists());
     }