From 32e2d173ab3d708b3b572a208c9cb69a1708a66a Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 22 Aug 2022 15:41:05 +0200 Subject: [PATCH 1/2] Fix Clippy warnings about deriving `Eq` Those show up with Rust 1.63.0. --- crates/fj-host/src/lib.rs | 2 +- crates/fj-kernel/src/algorithms/approx/faces.rs | 2 +- crates/fj/src/models/metadata.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/fj-host/src/lib.rs b/crates/fj-host/src/lib.rs index c4eda5f6b..f13f33146 100644 --- a/crates/fj-host/src/lib.rs +++ b/crates/fj-host/src/lib.rs @@ -342,7 +342,7 @@ impl Watcher { } /// Parameters that are passed to a model. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq)] pub struct Parameters(pub HashMap); impl Parameters { diff --git a/crates/fj-kernel/src/algorithms/approx/faces.rs b/crates/fj-kernel/src/algorithms/approx/faces.rs index 6a413e22f..602b1c702 100644 --- a/crates/fj-kernel/src/algorithms/approx/faces.rs +++ b/crates/fj-kernel/src/algorithms/approx/faces.rs @@ -7,7 +7,7 @@ use crate::objects::Face; use super::{CycleApprox, Local, Tolerance}; /// An approximation of a [`Face`] -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub struct FaceApprox { /// All points that make up the approximation /// diff --git a/crates/fj/src/models/metadata.rs b/crates/fj/src/models/metadata.rs index 91fd2fc21..dffa9fa92 100644 --- a/crates/fj/src/models/metadata.rs +++ b/crates/fj/src/models/metadata.rs @@ -116,7 +116,7 @@ impl Metadata { } /// Metadata about a [`crate::models::Model`]. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq)] pub struct ModelMetadata { /// A short, human-friendly name used to identify this model. pub name: String, @@ -167,7 +167,7 @@ impl ModelMetadata { } /// Metadata describing a model's argument. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq)] pub struct ArgumentMetadata { /// The name used to refer to this argument. pub name: String, From 06d6b0bf19e9728a18c349e5c3e69c1a614b738e Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 22 Aug 2022 15:41:56 +0200 Subject: [PATCH 2/2] Upgrade to Rust 1.63.0 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9e2065b1c..4a6c26620 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.62.1" +channel = "1.63.0" components = ["rustfmt", "clippy"]