Bump CI version

.circleci/config.yml

@@ -5,7 +5,7 @@ orbs:
 
 executors:
   rust:
-    docker: [{ image: rust:1.65.0 }]
+    docker: [{ image: rust:1.75.0 }]
 
 commands:
   restore_target:

changelog/@unreleased/pr-300.v2.yml

@@ -0,0 +1,5 @@
+type: feature
+feature:
+  description: Fix the build
+  links:
+  - https://github.com/palantir/conjure-rust/pull/300

conjure-codegen/src/context.rs

@@ -1091,7 +1091,7 @@ impl Context {
                         .cloned()
                         .or_else(|| self.type_log_safety(f.type_()))
                 })
-                .fold(Some(LogSafety::Safe), |a, b| self.combine_safety(a, b)),
+                .try_fold(LogSafety::Safe, |a, b| self.combine_safety(Some(a), b)),
             TypeDefinition::Union(union_) => union_
                 .union_()
                 .iter()

conjure-macros/src/lib.rs

@@ -496,7 +496,8 @@ fn add_path_components(
                         Error::new_spanned(
                             path_lit,
                             format_args!("invalid path parameter `{param}`"),
-                        ).into_compile_error(),
+                        )
+                        .into_compile_error(),
                     );
                     continue;
                 };
@@ -731,7 +732,9 @@ struct BodyAttr {
 impl ArgType {
     fn new(arg: &mut FnArg) -> syn::Result<Option<Self>> {
         // Ignore the self arg.
-        let FnArg::Typed(pat_type) = arg else { return Ok(None); };
+        let FnArg::Typed(pat_type) = arg else {
+            return Ok(None);
+        };
 
         // FIXME we should probably just rename the arguments in our impl?
         let ident = match &*pat_type.pat {

conjure-object/src/double_key.rs

@@ -57,7 +57,7 @@ impl DerefMut for DoubleKey {
 impl PartialOrd for DoubleKey {
     #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        OrderedFloat(self.0).partial_cmp(&OrderedFloat(other.0))
+        Some(self.cmp(other))
     }
 }
 

conjure-object/src/resource_identifier/mod.rs

@@ -217,7 +217,7 @@ impl Eq for ResourceIdentifier {}
 impl PartialOrd for ResourceIdentifier {
     #[inline]
     fn partial_cmp(&self, other: &ResourceIdentifier) -> Option<Ordering> {
-        self.rid.partial_cmp(&other.rid)
+        Some(self.cmp(other))
     }
 
     #[inline]

conjure-test/src/lib.rs

@@ -16,12 +16,12 @@
 #[cfg(test)]
 mod test;
 
-#[allow(dead_code, clippy::all)]
+#[allow(dead_code, unused_imports, clippy::all)]
 mod types {
     include!(concat!(env!("OUT_DIR"), "/conjure/mod.rs"));
 }
 
-#[allow(dead_code, clippy::all)]
+#[allow(dead_code, unused_imports, clippy::all)]
 mod staged_types {
     include!(concat!(env!("OUT_DIR"), "/conjure-staged/mod.rs"));
 }