Merge pull request #215 from Peter554/rust-2024-edition

Rust 2024 edition

Author: seddonym

rust/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "_rustgrimp"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 name = "_rustgrimp"

rust/Cargo.toml

@@ -1,6 +1,6 @@
 use crate::exceptions::{InvalidModuleExpression, ModuleNotPresent, NoSuchContainer};
-use pyo3::exceptions::PyValueError;
 use pyo3::PyErr;
+use pyo3::exceptions::PyValueError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]

rust/src/errors.rs

@@ -1,7 +1,7 @@
 use crate::errors::{GrimpError, GrimpResult};
 use crate::graph::{
-    ExtendWithDescendants, Graph, ImportDetails, ModuleToken, EMPTY_IMPORT_DETAILS,
-    EMPTY_MODULE_TOKENS, MODULE_NAMES,
+    EMPTY_IMPORT_DETAILS, EMPTY_MODULE_TOKENS, ExtendWithDescendants, Graph, ImportDetails,
+    MODULE_NAMES, ModuleToken,
 };
 use crate::module_expressions::ModuleExpression;
 use rustc_hash::FxHashSet;

rust/src/graph/direct_import_queries.rs

@@ -1,5 +1,5 @@
 use crate::graph::{
-    Graph, ImportDetails, Module, ModuleIterator, ModuleToken, IMPORT_LINE_CONTENTS, MODULE_NAMES,
+    Graph, IMPORT_LINE_CONTENTS, ImportDetails, MODULE_NAMES, Module, ModuleIterator, ModuleToken,
 };
 use rustc_hash::FxHashSet;
 use slotmap::secondary::Entry;

rust/src/graph/graph_manipulation.rs

@@ -1,4 +1,4 @@
-use crate::graph::{Graph, Module, ModuleIterator, ModuleToken, MODULE_NAMES};
+use crate::graph::{Graph, MODULE_NAMES, Module, ModuleIterator, ModuleToken};
 use crate::module_expressions::ModuleExpression;
 use rustc_hash::FxHashSet;
 
@@ -50,7 +50,10 @@ impl Graph {
         descendants.into_iter()
     }
 
-    pub fn find_matching_modules(&self, expression: &ModuleExpression) -> impl ModuleIterator {
+    pub fn find_matching_modules(
+        &self,
+        expression: &ModuleExpression,
+    ) -> impl ModuleIterator + use<'_> {
         let interner = MODULE_NAMES.read().unwrap();
         let modules: FxHashSet<_> = self
             .modules

rust/src/graph/hierarchy_queries.rs

@@ -3,7 +3,7 @@ use derive_new::new;
 use getset::{CopyGetters, Getters};
 use lazy_static::lazy_static;
 use rustc_hash::{FxHashMap, FxHashSet};
-use slotmap::{new_key_type, SecondaryMap, SlotMap};
+use slotmap::{SecondaryMap, SlotMap, new_key_type};
 use std::sync::RwLock;
 use string_interner::backend::StringBackend;
 use string_interner::{DefaultSymbol, StringInterner};

rust/src/graph/mod.rs

@@ -1,5 +1,5 @@
 use crate::errors::{GrimpError, GrimpResult};
-use crate::graph::{Graph, ModuleToken, EMPTY_MODULE_TOKENS};
+use crate::graph::{EMPTY_MODULE_TOKENS, Graph, ModuleToken};
 use indexmap::{IndexMap, IndexSet};
 use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
 use slotmap::SecondaryMap;