Merge pull request #2045 from hannobraun/rust

Upgrade to Rust 1.73.0

crates/fj-core/src/algorithms/transform/mod.rs

@@ -100,6 +100,9 @@ pub struct TransformCache(TypeMap);
 
 impl TransformCache {
  fn get<T: 'static>(&mut self, key: &Handle<T>) -> Option<&Handle<T>> {
+ // Silencing Clippy warning due to false positive in Rust 1.73.0. See:
+ // https://github.com/rust-lang/rust-clippy/issues/11390#issuecomment-1750951533
+ #[allow(clippy::unwrap_or_default)]
  let map = self
  .0
  .entry::<BTreeMap<ObjectId, Handle<T>>>()
@@ -109,6 +112,9 @@ impl TransformCache {
  }
 
  fn insert<T: 'static>(&mut self, key: Handle<T>, value: Handle<T>) {
+ // Silencing Clippy warning due to false positive in Rust 1.73.0. See:
+ // https://github.com/rust-lang/rust-clippy/issues/11390#issuecomment-1750951533
+ #[allow(clippy::unwrap_or_default)]
  let map = self
  .0
  .entry::<BTreeMap<ObjectId, Handle<T>>>()

crates/fj-core/src/geometry/boundary/single.rs

@@ -158,7 +158,7 @@ impl<T: CurveBoundaryElement> Ord for CurveBoundary<T> {
 
 impl<T: CurveBoundaryElement> PartialOrd for CurveBoundary<T> {
  fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- self.inner.partial_cmp(&other.inner)
+ Some(self.cmp(other))
  }
 }
 

crates/fj-core/src/storage/handle.rs

@@ -245,7 +245,7 @@ impl<T> Ord for HandleWrapper<T> {
 
 impl<T> PartialOrd for HandleWrapper<T> {
  fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- self.0.id().partial_cmp(&other.0.id())
+ Some(self.cmp(other))
  }
 }
 

crates/fj-math/src/scalar.rs

@@ -160,15 +160,15 @@ impl Eq for Scalar {}
 
 impl PartialOrd for Scalar {
  fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
- self.0.partial_cmp(&other.0)
+ Some(self.cmp(other))
  }
 }
 
 impl Ord for Scalar {
  fn cmp(&self, other: &Self) -> cmp::Ordering {
  // Should never panic, as `from_f64` checks that the wrapped value is
  // finite.
- self.partial_cmp(other).expect("Invalid `Scalar`")
+ self.0.partial_cmp(&other.0).expect("Invalid `Scalar`")
  }
 }
 

crates/fj-viewer/src/viewer.rs

@@ -1,5 +1,4 @@
 use fj_interop::model::Model;
-use fj_math::Aabb;
 use tracing::warn;
 
 use crate::{
@@ -93,7 +92,7 @@ impl Viewer {
  .model
  .as_ref()
  .map(|shape| shape.aabb)
- .unwrap_or_else(Aabb::default);
+ .unwrap_or_default();
 
  self.camera.update_planes(&aabb);
 

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.72.1"
+channel = "1.73.0"
 components = ["rustfmt", "clippy"]
 targets = [
  "aarch64-apple-ios",