Merge branch 'master' into add-histogram-count-and-sum-accessors

Author: cratelyn

Cargo.toml

@@ -38,7 +38,7 @@ axum = "0.7"
 criterion = "0.5"
 futures = "0.3"
 http-types = "2"
-pyo3 = "0.22"
+pyo3 = "0.27"
 quickcheck = "1"
 rand = "0.8.4"
 tide = "0.16"

src/encoding/text.rs

@@ -1251,21 +1251,21 @@ mod tests {
     }
 
     fn parse_with_python_client(input: String) {
-        pyo3::prepare_freethreaded_python();
+        pyo3::Python::initialize();
 
         println!("{input:?}");
-        Python::with_gil(|py| {
-            let parser = PyModule::from_code_bound(
+        Python::attach(|py| {
+            let parser = PyModule::from_code(
                 py,
-                r#"
+                c"
 from prometheus_client.openmetrics.parser import text_string_to_metric_families
 
 def parse(input):
     families = text_string_to_metric_families(input)
     list(families)
-"#,
-                "parser.py",
-                "parser",
+",
+                c"parser.py",
+                c"parser",
             )
             .map_err(|e| e.to_string())
             .unwrap();

src/metrics/counter.rs

@@ -265,7 +265,7 @@ mod tests {
                 // Map infinite, subnormal and NaN to 0.0.
                 .map(|f| if f.is_normal() { f } else { 0.0 })
                 .collect();
-            let sum = fs.iter().sum();
+            let sum: f64 = fs.iter().sum();
             let counter = Counter::<f64, AtomicU64>::default();
             for f in fs {
                 counter.inc_by(f);

src/registry.rs

@@ -228,15 +228,15 @@ impl Registry {
     /// let subsystem_a_counter_2: Counter = Counter::default();
     ///
     /// let subsystem_a_registry = registry.sub_registry_with_prefix("subsystem_a");
-    /// registry.register("counter_1", "", subsystem_a_counter_1.clone());
-    /// registry.register("counter_2", "", subsystem_a_counter_2.clone());
+    /// subsystem_a_registry.register("counter_1", "", subsystem_a_counter_1.clone());
+    /// subsystem_a_registry.register("counter_2", "", subsystem_a_counter_2.clone());
     ///
     /// let subsystem_b_counter_1: Counter = Counter::default();
     /// let subsystem_b_counter_2: Counter = Counter::default();
     ///
-    /// let subsystem_a_registry = registry.sub_registry_with_prefix("subsystem_b");
-    /// registry.register("counter_1", "", subsystem_b_counter_1.clone());
-    /// registry.register("counter_2", "", subsystem_b_counter_2.clone());
+    /// let subsystem_b_registry = registry.sub_registry_with_prefix("subsystem_b");
+    /// subsystem_b_registry.register("counter_1", "", subsystem_b_counter_1.clone());
+    /// subsystem_b_registry.register("counter_2", "", subsystem_b_counter_2.clone());
     /// ```
     ///
     /// See [`Registry::sub_registry_with_label`] for the same functionality,