optify 0.8.2__tar.gz → 0.8.3__tar.gz

{optify-0.8.2 → optify-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optify
-Version: 0.8.2
+Version: 0.8.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{optify-0.8.2 → optify-0.8.3}/pyproject.toml

@@ -26,11 +26,11 @@ build-backend = "maturin"
 
 [package]
 name = "optify"
-version = "0.8.2"
+version = "0.8.3"
 
 [tool.poetry]
 name = "optify"
-version = "0.8.2"
+version = "0.8.3"
 description = "Simplifies getting the right configuration options for a process using pre-loaded configurations from files to manage options for experiments or flights."
 authors = ["Justin D. Harris"]
 maintainers = ["Justin D. Harris"]

{optify-0.8.2 → optify-0.8.3}/python/optify/Cargo.lock

@@ -1132,7 +1132,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "optify"
-version = "0.20.2"
+version = "0.20.3"
 dependencies = [
  "config",
  "dunce",
@@ -1150,7 +1150,7 @@ dependencies = [
 
 [[package]]
 name = "optify-python"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "optify",
  "pyo3",
@@ -1295,11 +1295,10 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.24.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -1313,19 +1312,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.24.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.24.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1333,9 +1331,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.24.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1345,9 +1343,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",

{optify-0.8.2 → optify-0.8.3}/python/optify/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "optify-python"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 
 description = "Simplifies getting the right configuration options for a process using pre-loaded configurations from files (JSON, YAML, etc.) to manage options for experiments or flights. This library is mainly made to support building implementations for other languages such as Node.js, Python, and Ruby. It is not meant to be consumed directly yet."
@@ -15,5 +15,5 @@ name = "optify"
 crate-type = ["cdylib"]
 
 [dependencies]
-optify = { path = "../../rust/optify", version = "0.20.2" }
-pyo3 = "0.24.1"
+optify = { path = "../../rust/optify", version = "0.20.3" }
+pyo3 = "0.27.1"

{optify-0.8.2 → optify-0.8.3}/rust/optify/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "optify"
-version = "0.20.2"
+version = "0.20.3"
 edition = "2021"
 build = "build.rs"
 

{optify-0.8.2 → optify-0.8.3}/rust/optify/src/builder/builder_impl.rs

@@ -81,7 +81,7 @@ fn resolve_imports(
     let mut config_builder = config::Config::builder();
     for import in imports_for_feature {
         // Validate imports.
-        if !features_in_resolution_path.insert(import.clone()) {
+        if features_in_resolution_path.contains(import) {
             // The import is already in the path, so there is a cycle.
             return Err(format!(
                     "Error when resolving imports for '{canonical_feature_name}': Cycle detected with import '{import}'. The features in the path (not in order): {features_in_resolution_path:?}"
@@ -108,21 +108,22 @@ fn resolve_imports(
         // Get the source so that we can build the configuration.
         // Getting the source also ensures the import is a canonical feature name.
         let mut source = match sources.get(import) {
-                Some(s) => s,
-                // The import is not a canonical feature name.
-                None => match aliases.get(&unicase::UniCase::new(import.clone())) {
-                    Some(canonical_name_for_import) => {
-                        return Err(format!(
-                            "Error when resolving imports for '{canonical_feature_name}': The import '{import}' is not a canonical feature name. Use '{canonical_name_for_import}' instead of '{import}' in order to keep dependencies clear and to help with navigating through files."
-                        ))
-                    }
-                    None => {
-                        return Err(format!(
-                            "Error when resolving imports for '{canonical_feature_name}': The import '{import}' is not a canonical feature name and not a recognized alias. Use a canonical feature name in order to keep dependencies clear and to help with navigating through files."
-                        ))
-                    }
-                },
-            };
+            Some(s) => s,
+            // The import is not a canonical feature name.
+            None => match aliases.get(&unicase::UniCase::new(import.clone())) {
+                Some(canonical_name_for_import) => {
+                    return Err(format!(
+                        "Error when resolving imports for '{canonical_feature_name}': The import '{import}' is not a canonical feature name. Use '{canonical_name_for_import}' instead of '{import}' in order to keep dependencies clear and to help with navigating through files."
+                    ))
+                }
+                None => {
+                    return Err(format!(
+                        "Error when resolving imports for '{canonical_feature_name}': The import '{import}' is not a canonical feature name and not a recognized alias. Use a canonical feature name in order to keep dependencies clear and to help with navigating through files."
+                    ))
+                }
+            },
+        };
+
         if resolved_imports.insert(import.clone()) {
             if let Some(imports_for_import) = all_imports.get(import) {
                 let mut _features_in_resolution_path = features_in_resolution_path.clone();