Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up rstar versioned dependencies #759

Merged
merged 6 commits into from
Mar 16, 2022
Merged

Clean up rstar versioned dependencies #759

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b5ccf7
Clean up rstar versioned dependencies
nyurik Mar 8, 2022
188dd65
fixed a few leftover cfgs
nyurik Mar 8, 2022
036d3bc
Merge branch 'main' into rstar
nyurik Mar 10, 2022
1dbace9
changelog
nyurik Mar 10, 2022
9846993
Update geo-types/CHANGES.md
nyurik Mar 10, 2022
bc8f3a8
Merge branch 'master' into rstar
nyurik Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions geo-test-fixtures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ version = "0.1.0"
edition = "2021"
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
wkt = { version = "0.9", default-features = false }
geo-types = { path = "../geo-types" }
2 changes: 2 additions & 0 deletions geo-types/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* <https://github.com/georust/geo/pull/741>
* Macros `coord!`, `point!`, `line_string!`, and `polygon!` now support trailing commas such as `coord! { x: 181.2, y: 51.79, }`
* <https://github.com/georust/geo/pull/752>
* Internal cleanup: Explicitly declare `rstar_0_8` and `rstar_0_9` features to be explicit which rstar version is being used. For backward compatibility, the `rstar` feature will still enable `rstar_0_8`.
nyurik marked this conversation as resolved.
Show resolved Hide resolved
* <https://github.com/georust/geo/pull/759>

## 0.7.3

Expand Down
12 changes: 7 additions & 5 deletions geo-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@ description = "Geospatial primitive data types"
edition = "2021"

[features]
use-rstar = ["rstar", "approx"]
# Prefer `use-rstar` feature rather than enabling rstar directly.
# rstar integration relies on the optional approx crate, but implicit features cannot yet enable other features.
# See: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#namespaced-features
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#namespaced-features

Namespaced features has been stabilized in the 1.60 release.

Nice! So in 4 releases (~24 weeks) we could think about utilizing them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(unrelated to your PR, I know... the diff just caused me to check the link)

rstar = ["rstar_0_8"]
use-rstar = ["use-rstar_0_8"]
use-rstar_0_8 = ["rstar_0_8", "approx"]
use-rstar_0_9 = ["rstar_0_9", "approx"]

[dependencies]
approx = { version = "0.4.0", optional = true }
arbitrary = { version = "1", optional = true }
num-traits = "0.2"
# Prefer `use-rstar` feature rather than enabling rstar directly.
# rstar integration relies on the optional approx crate, but implicit features cannot yet enable other features.
# See: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#namespaced-features
rstar = { version = "0.8", optional = true }
rstar_0_8 = { package = "rstar", version = "0.8", optional = true }
rstar_0_9 = { package = "rstar", version = "0.9", optional = true }
serde = { version = "1", optional = true, features = ["derive"] }

Expand Down
6 changes: 3 additions & 3 deletions geo-types/src/coordinate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,10 @@ where
}
}

#[cfg(feature = "rstar")]
impl<T> ::rstar::Point for Coordinate<T>
#[cfg(feature = "rstar_0_8")]
impl<T> ::rstar_0_8::Point for Coordinate<T>
where
T: ::num_traits::Float + ::rstar::RTreeNum,
T: ::num_traits::Float + ::rstar_0_8::RTreeNum,
{
type Scalar = T;

Expand Down
14 changes: 7 additions & 7 deletions geo-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
//! - `approx`: Allows geometry types to be checked for approximate equality with [approx]
//! - `arbitrary`: Allows geometry types to be created from unstructured input with [arbitrary]
//! - `serde`: Allows geometry types to be serialized and deserialized with [Serde]
//! - `use-rstar`: Allows geometry types to be inserted into [rstar] R*-trees (`rstar v0.8`)
//! - `use-rstar_0_8`: Allows geometry types to be inserted into [rstar] R*-trees (`rstar v0.8`)
//! - `use-rstar_0_9`: Allows geometry types to be inserted into [rstar] R*-trees (`rstar v0.9`)
//!
//! [approx]: https://github.com/brendanzab/approx
Expand All @@ -57,8 +57,8 @@ use std::fmt::Debug;
#[macro_use]
extern crate serde;

#[cfg(feature = "rstar")]
extern crate rstar;
#[cfg(feature = "rstar_0_8")]
extern crate rstar_0_8;

#[cfg(test)]
#[macro_use]
Expand Down Expand Up @@ -129,7 +129,7 @@ mod macros;
#[cfg(feature = "arbitrary")]
mod arbitrary;

#[cfg(feature = "rstar")]
#[cfg(feature = "rstar_0_8")]
#[doc(hidden)]
pub mod private_utils;

Expand Down Expand Up @@ -209,12 +209,12 @@ mod tests {
assert_eq!(p.x(), 1_000_000i64);
}

#[cfg(feature = "rstar")]
#[cfg(feature = "rstar_0_8")]
#[test]
/// ensure Line's SpatialObject impl is correct
fn line_test() {
use rstar::primitives::Line as RStarLine;
use rstar::{PointDistance, RTreeObject};
use rstar_0_8::primitives::Line as RStarLine;
use rstar_0_8::{PointDistance, RTreeObject};

let rl = RStarLine::new(Point::new(0.0, 0.0), Point::new(5.0, 5.0));
let l = Line::new(Coordinate { x: 0.0, y: 0.0 }, Coordinate { x: 5., y: 5. });
Expand Down
5 changes: 3 additions & 2 deletions geo-types/src/line.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ impl<T: AbsDiffEq<Epsilon = T> + CoordNum> AbsDiffEq for Line<T> {
}
}

#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
macro_rules! impl_rstar_line {
($rstar:ident) => {
impl<T> ::$rstar::RTreeObject for Line<T>
Expand All @@ -247,8 +248,8 @@ macro_rules! impl_rstar_line {
};
}

#[cfg(feature = "rstar")]
impl_rstar_line!(rstar);
#[cfg(feature = "rstar_0_8")]
impl_rstar_line!(rstar_0_8);

#[cfg(feature = "rstar_0_9")]
impl_rstar_line!(rstar_0_9);
Expand Down
5 changes: 3 additions & 2 deletions geo-types/src/line_string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ impl<T: AbsDiffEq<Epsilon = T> + CoordNum> AbsDiffEq for LineString<T> {
}
}

#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
macro_rules! impl_rstar_line_string {
($rstar:ident) => {
impl<T> ::$rstar::RTreeObject for LineString<T>
Expand Down Expand Up @@ -499,8 +500,8 @@ macro_rules! impl_rstar_line_string {
};
}

#[cfg(feature = "rstar")]
impl_rstar_line_string!(rstar);
#[cfg(feature = "rstar_0_8")]
impl_rstar_line_string!(rstar_0_8);

#[cfg(feature = "rstar_0_9")]
impl_rstar_line_string!(rstar_0_9);
Expand Down
6 changes: 3 additions & 3 deletions geo-types/src/point.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,11 @@ where
}
}

#[cfg(feature = "rstar")]
#[cfg(feature = "rstar_0_8")]
// These are required for rstar RTree
impl<T> ::rstar::Point for Point<T>
impl<T> ::rstar_0_8::Point for Point<T>
where
T: ::num_traits::Float + ::rstar::RTreeNum,
T: ::num_traits::Float + ::rstar_0_8::RTreeNum,
{
type Scalar = T;

Expand Down
8 changes: 4 additions & 4 deletions geo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ use-serde = ["serde", "geo-types/serde"]

[dependencies]
geo-types = { version = "0.7.3", features = ["approx", "use-rstar"] }
geographiclib-rs = { version = "0.2" }
geographiclib-rs = "0.2"
log = "0.4.11"
num-traits = "0.2"
proj = { version = "0.25.2", optional = true }
robust = { version = "0.2.2" }
rstar = { version = "0.8" }
robust = "0.2.2"
rstar = "0.8"
serde = { version = "1.0", optional = true, features = ["derive"] }

[dev-dependencies]
approx = "0.4.0"
criterion = { version = "0.3" }
criterion = "0.3"
geo-test-fixtures = { path = "../geo-test-fixtures" }
# jts-test-runner is an internal crate which exists only to be part of the geo test suite.
# As such it's kept unpublished. It's in a separate repo primarily because it's kind of large.
Expand Down