Skip to content

Commit 9b1147b

Browse files
committed
Migrate from 'num' to 'num_traits' crate.
The 'num' crate is a meta-crate consisting of multiple librarie crates, including 'num_traits'. We only need access to 'num_traits', we can just depend on that.
1 parent de7ff57 commit 9b1147b

14 files changed

+16
-16
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ documentation = "https://georust.github.io/rust-geo/"
1010
keywords = ["gis", "geo", "geography", "geospatial"]
1111

1212
[dependencies]
13-
num = "0.1"
13+
num-traits = "0.1"

src/algorithm/area.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::Float;
1+
use num_traits::Float;
22
use types::{LineString, Polygon, MultiPolygon, Bbox};
33

44
/// Calculation of the area.
@@ -59,7 +59,7 @@ impl<T> Area<T> for Bbox<T>
5959

6060
#[cfg(test)]
6161
mod test {
62-
use num::Float;
62+
use num_traits::Float;
6363
use types::{Coordinate, Point, LineString, Polygon, MultiPolygon, Bbox};
6464
use algorithm::area::Area;
6565
use test_helpers::within_epsilon;

src/algorithm/boundingbox.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::Float;
1+
use num_traits::Float;
22

33
use types::{Bbox, Point, MultiPoint, LineString, MultiLineString, Polygon, MultiPolygon};
44

src/algorithm/centroid.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::{Float, FromPrimitive};
1+
use num_traits::{Float, FromPrimitive};
22

33
use types::{Point, LineString, Polygon, MultiPolygon, Bbox};
44
use algorithm::area::Area;

src/algorithm/contains.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::{Float, ToPrimitive};
1+
use num_traits::{Float, ToPrimitive};
22

33
use types::{COORD_PRECISION, Point, LineString, Polygon, MultiPolygon, Bbox};
44
use algorithm::intersects::Intersects;

src/algorithm/distance.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use std::cmp::Ordering;
22
use std::collections::BinaryHeap;
3-
use num::{Float, ToPrimitive};
3+
use num_traits::{Float, ToPrimitive};
44
use types::{Point, LineString, Polygon};
55
use algorithm::contains::Contains;
6-
use num::pow::pow;
6+
use num_traits::pow::pow;
77

88
/// Returns the distance between two geometries.
99

src/algorithm/intersects.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::Float;
1+
use num_traits::Float;
22
use types::{LineString, Polygon, Bbox, Point};
33
use algorithm::contains::Contains;
44

src/algorithm/length.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::Float;
1+
use num_traits::Float;
22

33
use types::{LineString, MultiLineString};
44
use algorithm::distance::Distance;

src/algorithm/simplify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::Float;
1+
use num_traits::Float;
22
use types::{Point, LineString};
33
use algorithm::distance::Distance;
44

src/algorithm/simplifyvw.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::cmp::Ordering;
22
use std::collections::BinaryHeap;
3-
use num::Float;
3+
use num_traits::Float;
44
use types::{Point, LineString};
55

66
// A helper struct for `visvalingam`, defined out here because

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extern crate num;
1+
extern crate num_traits;
22

33
pub use traits::ToGeo;
44
pub use types::*;

src/test_helpers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use num::Float;
1+
use num_traits::Float;
22

33
pub fn within_epsilon<F: Float>(x: F, y: F, epsilon: F) -> bool {
44
let a = x.abs();

src/traits.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pub use ::Geometry;
22

3-
use num::Float;
3+
use num_traits::Float;
44

55
pub trait ToGeo<T: Float>
66
{

src/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::ops::AddAssign;
33
use std::ops::Neg;
44
use std::ops::Sub;
55

6-
use num::{Float, ToPrimitive};
6+
use num_traits::{Float, ToPrimitive};
77

88
pub static COORD_PRECISION: f32 = 1e-1; // 0.1m
99

0 commit comments

Comments
 (0)