From b90eb7c3180ddf0f29d0f70f860c901ef50b098e Mon Sep 17 00:00:00 2001 From: Scott Donnelly Date: Fri, 9 Feb 2024 07:38:10 +0000 Subject: [PATCH 1/5] fix: stdsimd removed from unstable fix: fixup simd removal --- src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 524d7146..6fc8ef18 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,3 @@ -#![cfg_attr(feature = "simd", feature(stdsimd))] #![cfg_attr(feature = "simd", feature(slice_as_chunks))] #![cfg_attr(feature = "global_allocate", feature(allocator_api))] #![warn(rustdoc::missing_crate_level_docs)] From 5e046570a4a010c0c04cc560e85db437375f33e6 Mon Sep 17 00:00:00 2001 From: Scott Donnelly Date: Fri, 9 Feb 2024 07:41:32 +0000 Subject: [PATCH 2/5] chore: remove unused import --- src/fixed/kdtree.rs | 2 -- src/float/kdtree.rs | 2 -- src/float_leaf_simd/leaf_node.rs | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/fixed/kdtree.rs b/src/fixed/kdtree.rs index 9a7f6b48..e090adc1 100644 --- a/src/fixed/kdtree.rs +++ b/src/fixed/kdtree.rs @@ -9,8 +9,6 @@ use fixed::traits::Fixed; use std::cmp::PartialEq; use std::fmt::Debug; -#[cfg(feature = "serialize")] -use crate::custom_serde::*; use crate::types::{Content, Index}; #[cfg(feature = "serialize")] use serde::{Deserialize, Serialize}; diff --git a/src/float/kdtree.rs b/src/float/kdtree.rs index d27478f3..b717f00e 100644 --- a/src/float/kdtree.rs +++ b/src/float/kdtree.rs @@ -7,8 +7,6 @@ use num_traits::float::FloatCore; use std::cmp::PartialEq; use std::fmt::Debug; -#[cfg(feature = "serialize")] -use crate::custom_serde::*; use crate::types::{Content, Index}; #[cfg(feature = "serialize")] use serde::{Deserialize, Serialize}; diff --git a/src/float_leaf_simd/leaf_node.rs b/src/float_leaf_simd/leaf_node.rs index 3985355a..57980369 100644 --- a/src/float_leaf_simd/leaf_node.rs +++ b/src/float_leaf_simd/leaf_node.rs @@ -1,5 +1,3 @@ -#[cfg(feature = "serialize")] -use crate::custom_serde::*; use az::Cast; #[cfg(feature = "serialize")] use serde::{Deserialize, Serialize}; From 81b3401a8adddfec3b9d641701fd91b439dd0f9c Mon Sep 17 00:00:00 2001 From: Scott Donnelly Date: Fri, 9 Feb 2024 07:44:24 +0000 Subject: [PATCH 3/5] fix: add missing global_allocate feature definition and sort feature defs alphabetically --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b9fe8893..e4f5f4f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,11 +85,12 @@ default-features = false features = ["alloc", "copy_unsafe", "size_64"] [features] +global_allocate = [] +immutable = [] serialize = ["serde", "serde_derive", "serde_with", "fixed/serde"] serialize_rkyv = ["rkyv"] simd = [] tracing = ["dep:tracing", "tracing-subscriber"] -immutable = [] default = ["tracing"] [package.metadata.docs.rs] From 8aa4fae1904eb944feb29909b5406016c812451a Mon Sep 17 00:00:00 2001 From: Scott Donnelly Date: Fri, 9 Feb 2024 19:41:27 +0000 Subject: [PATCH 4/5] refactor: remove need for gated import --- src/fixed/kdtree.rs | 7 +++++-- src/float/kdtree.rs | 7 +++++-- src/float_leaf_simd/leaf_node.rs | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/fixed/kdtree.rs b/src/fixed/kdtree.rs index e090adc1..18046787 100644 --- a/src/fixed/kdtree.rs +++ b/src/fixed/kdtree.rs @@ -122,7 +122,10 @@ pub(crate) struct LeafNode< const B: usize, IDX, > { - #[cfg_attr(feature = "serialize", serde(with = "array_of_arrays"))] + #[cfg_attr( + feature = "serialize", + serde(with = "crate::custom_serde::array_of_arrays") + )] #[cfg_attr( feature = "serialize", serde(bound( @@ -133,7 +136,7 @@ pub(crate) struct LeafNode< // TODO: Refactor content_points to be [[A; B]; K] to see if this helps vectorisation pub(crate) content_points: [[A; K]; B], - #[cfg_attr(feature = "serialize", serde(with = "array"))] + #[cfg_attr(feature = "serialize", serde(with = "crate::custom_serde::array"))] #[cfg_attr( feature = "serialize", serde(bound( diff --git a/src/float/kdtree.rs b/src/float/kdtree.rs index b717f00e..cfb6f11e 100644 --- a/src/float/kdtree.rs +++ b/src/float/kdtree.rs @@ -82,7 +82,10 @@ pub struct StemNode { )] #[derive(Clone, Debug, PartialEq)] pub struct LeafNode { - #[cfg_attr(feature = "serialize", serde(with = "array_of_arrays"))] + #[cfg_attr( + feature = "serialize", + serde(with = "crate::custom_serde::array_of_arrays") + )] #[cfg_attr( feature = "serialize", serde(bound(serialize = "A: Serialize", deserialize = "A: Deserialize<'de>")) @@ -90,7 +93,7 @@ pub struct LeafNode { - #[cfg_attr(feature = "serialize", serde(with = "array_of_arrays"))] + #[cfg_attr( + feature = "serialize", + serde(with = "crate::custom_serde::array_of_arrays") + )] #[cfg_attr( feature = "serialize", serde(bound(serialize = "A: Serialize", deserialize = "A: Deserialize<'de>")) )] pub content_points: [[A; B]; K], - #[cfg_attr(feature = "serialize", serde(with = "array"))] + #[cfg_attr(feature = "serialize", serde(with = "crate::custom_serde::array"))] #[cfg_attr( feature = "serialize", serde(bound( From 202ab9f65fe08966161ae548aff7c5d01a599dae Mon Sep 17 00:00:00 2001 From: Scott Donnelly Date: Thu, 15 Feb 2024 07:06:54 +0000 Subject: [PATCH 5/5] ci: fix issue with CI lint steps --- .github/workflows/build.yml | 2 ++ Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08a8169e..0cea2dbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,6 +69,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} options: --features=serialize,serialize_rkyv --no-deps + name: Clippy (stable) - name: Check Rustdoc Links run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items @@ -105,6 +106,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} options: --all-features --no-deps + name: Clippy (nightly) - name: Check Rustdoc Links run: RUSTDOCFLAGS="--deny broken_intra_doc_links" cargo doc --verbose --workspace --no-deps --document-private-items diff --git a/Cargo.toml b/Cargo.toml index e4f5f4f8..87550e31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ features = ["alloc", "copy_unsafe", "size_64"] [features] global_allocate = [] immutable = [] -serialize = ["serde", "serde_derive", "serde_with", "fixed/serde"] +serialize = ["serde", "serde/derive", "serde_derive", "serde_with", "fixed/serde"] serialize_rkyv = ["rkyv"] simd = [] tracing = ["dep:tracing", "tracing-subscriber"]