fix(libflux): build on rust 1.78

libflux/flux-core/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "flux-core"
 version = "0.154.0"
+rust-version = "1.68"
 authors = ["Flux Team <[email protected]>"]
 edition = "2021"
 

libflux/flux-core/src/semantic/flatbuffers/types.rs

@@ -97,7 +97,7 @@ impl From<fb::PolyType<'_>> for Option<PolyType> {
         for value in c.iter() {
             let constraint: Option<(BoundTvar, Kind)> = value.into();
             let (tv, kind) = constraint?;
-            cons.entry(tv).or_insert_with(Vec::new).push(kind);
+            cons.entry(tv).or_default().push(kind);
         }
         Some(PolyType {
             vars,
@@ -350,9 +350,9 @@ where
     builder.finished_data()
 }
 
-pub fn deserialize<'a, T: 'a, S>(buf: &'a [u8]) -> S
+pub fn deserialize<'a, T, S>(buf: &'a [u8]) -> S
 where
-    T: flatbuffers::Follow<'a> + flatbuffers::Verifiable,
+    T: flatbuffers::Follow<'a> + flatbuffers::Verifiable + 'a,
     S: std::convert::From<T::Inner>,
 {
     flatbuffers::root::<T>(buf).unwrap().into()

libflux/flux-core/src/semantic/nodes.rs

@@ -860,8 +860,8 @@ impl VariableAssgn {
         //
         // Note these variables are fixed after generalization
         // and so it is safe to update these nodes in place.
-        self.vars = p.vars.clone();
-        self.cons = p.cons.clone();
+        self.vars.clone_from(&p.vars);
+        self.cons.clone_from(&p.cons);
 
         // Update the type environment
         infer.add(self.id.name.clone(), p);

libflux/flux-core/src/semantic/sub.rs

@@ -431,7 +431,7 @@ where
 }
 
 #[allow(clippy::too_many_arguments, clippy::type_complexity)]
-pub(crate) fn merge4<A: ?Sized, B: ?Sized, C: ?Sized, D: ?Sized>(
+pub(crate) fn merge4<A, B, C, D>(
     a_original: &A,
     a: Option<A::Owned>,
     b_original: &B,
@@ -442,10 +442,10 @@ pub(crate) fn merge4<A: ?Sized, B: ?Sized, C: ?Sized, D: ?Sized>(
     d: Option<D::Owned>,
 ) -> Option<(A::Owned, B::Owned, C::Owned, D::Owned)>
 where
-    A: ToOwned,
-    B: ToOwned,
-    C: ToOwned,
-    D: ToOwned,
+    A: ToOwned + ?Sized,
+    B: ToOwned + ?Sized,
+    C: ToOwned + ?Sized,
+    D: ToOwned + ?Sized,
 {
     let a_b_c = merge3(a_original, a, b_original, b, c_original, c);
     merge_fn(
@@ -465,7 +465,7 @@ where
     .map(|((a, b, c), d)| (a, b, c, d))
 }
 
-pub(crate) fn merge3<A: ?Sized, B: ?Sized, C: ?Sized>(
+pub(crate) fn merge3<A, B, C>(
     a_original: &A,
     a: Option<A::Owned>,
     b_original: &B,
@@ -474,9 +474,9 @@ pub(crate) fn merge3<A: ?Sized, B: ?Sized, C: ?Sized>(
     c: Option<C::Owned>,
 ) -> Option<(A::Owned, B::Owned, C::Owned)>
 where
-    A: ToOwned,
-    B: ToOwned,
-    C: ToOwned,
+    A: ToOwned + ?Sized,
+    B: ToOwned + ?Sized,
+    C: ToOwned + ?Sized,
 {
     let a_b = merge(a_original, a, b_original, b);
     merge_fn(
@@ -492,15 +492,15 @@ where
 
 /// Merges two values using `f` if either or both them is `Some(..)`.
 /// If both are `None`, `None` is returned.
-pub(crate) fn merge<A: ?Sized, B: ?Sized>(
+pub(crate) fn merge<A, B>(
     a_original: &A,
     a: Option<A::Owned>,
     b_original: &B,
     b: Option<B::Owned>,
 ) -> Option<(A::Owned, B::Owned)>
 where
-    A: ToOwned,
-    B: ToOwned,
+    A: ToOwned + ?Sized,
+    B: ToOwned + ?Sized,
 {
     merge_fn(a_original, A::to_owned, a, b_original, B::to_owned, b)
 }

libflux/flux-core/src/semantic/types.rs

@@ -1314,7 +1314,7 @@ fn collect_record(record: &Record) -> (RefMonoTypeVecMap<'_, RecordLabel>, Optio
 
     let mut fields = record.fields();
     for field in &mut fields {
-        a.entry(&field.k).or_insert_with(Vec::new).push(&field.v);
+        a.entry(&field.k).or_default().push(&field.v);
     }
     (a, fields.tail())
 }
@@ -1804,7 +1804,7 @@ impl PartialEq<&str> for Label {
 
 impl PartialOrd for Label {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.0.name().partial_cmp(other.0.name())
+        Some(self.cmp(other))
     }
 }
 
@@ -1955,10 +1955,10 @@ impl<T> Function<T> {
         self.opt.len() + self.req.len() + self.pipe.is_some() as usize
     }
 
-    pub(crate) fn parameter<Q: ?Sized>(&self, key: &Q) -> Option<&T>
+    pub(crate) fn parameter<Q>(&self, key: &Q) -> Option<&T>
     where
         String: Borrow<Q> + Ord,
-        Q: Ord,
+        Q: Ord + ?Sized,
     {
         self.req
             .get(key)
@@ -2189,8 +2189,10 @@ impl Function {
 pub(crate) trait TypeLike {
     type Error;
     fn typ(&self) -> &MonoType;
+    #[allow(dead_code)]
     fn into_type(self) -> MonoType;
     fn error(&self, error: Error) -> Self::Error;
+    #[allow(dead_code)]
     fn location(&self) -> crate::ast::SourceLocation;
 }
 

libflux/flux-core/src/semantic/walk/mod.rs

@@ -269,6 +269,7 @@ macro_rules! mk_node {
 
         /// Recursively visits children of a node given a Visitor.
         /// Nodes are visited in depth-first order.
+        #[allow(clippy::needless_lifetimes)]
         pub fn $walk<'a, T>(v: &mut T, $($mut)? node: $name<'a>)
         where
             T: ?Sized + $visitor $(<$visitor_lt>)?,

libflux/flux/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "flux"
 version = "0.154.0"
+rust-version = "1.68"
 authors = ["Flux Team <[email protected]>"]
 edition = "2021"
 

libflux/flux/src/cffi.rs

@@ -1159,7 +1159,7 @@ from(bucket: v.bucket)
         // Safety: both parameters are valid
         let err = unsafe { flux_ast_get_error(pkg, options) }.unwrap();
         // Safety: pkg is a valid pointer allocated just above
-        unsafe { Box::from_raw(pkg) }; // Free the AST
+        unsafe { drop(Box::from_raw(pkg)) }; // Free the AST
         let msg = err.message.to_string_lossy();
         assert!(
             msg.contains("incomplete utf-8 byte sequence from index 0"),