Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,20 @@ readme = "Readme.md"
license = "MIT"

[dependencies]
rand = "0.3"
ordered-float = "0.5.0"
log = "0.3"
log = "0.4"
fnv = "1.0"
serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true }

[target.'cfg(not(features="serde_derive"))'.dependencies.ordered-float]
version = "1.0"

[target.'cfg(features="serde_derive")'.dependencies.ordered-float]
version = "1.0"
features = ["serde"]

[dev-dependencies]
serde_test = "1.0"

[features]
serde_support = ["serde", "serde_derive"]
8 changes: 7 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@

#[macro_use]
extern crate log;
extern crate rand;
extern crate ordered_float;
extern crate fnv;

#[cfg(feature = "serde_support")]
extern crate serde;

#[cfg(feature = "serde_support")]
#[macro_use]
extern crate serde_derive;

mod geometry;
mod point;
mod dcel;
Expand Down
9 changes: 1 addition & 8 deletions src/point.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use rand::{Rand, Rng, random};
use std::ops::{Sub, Mul, Add};
use std::fmt;
use ordered_float::OrderedFloat;
use std::cmp::Ordering;

/// A point in two dimensions
#[derive(Clone, Copy, PartialEq, Eq)]
#[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))]
pub struct Point {
/// x coordinate
pub x: OrderedFloat<f64>,
Expand Down Expand Up @@ -36,13 +36,6 @@ impl fmt::Debug for Point {
}
}

#[allow(unused_variables)]
impl Rand for Point {
fn rand<R: Rng>(rng: &mut R) -> Point {
Point::new(random::<f64>(), random::<f64>())
}
}

impl Mul<f64> for Point {
type Output = Point;

Expand Down