This commit is contained in:
Pierre Krieger 2015-04-24 13:54:03 +02:00
parent a058142a2c
commit 8a34332f5f
2 changed files with 2 additions and 6 deletions

View file

@ -15,7 +15,7 @@
language: rust language: rust
rust: rust:
- 1.0.0-beta - 1.0.0-beta.2
env: env:
global: global:
- secure: S0l5RmsFJgbDdzXjHsCluexb1R9RklpxZMJgr9RcieeqSqaJDPUht53yBZDyuk04/KzEbtM5yxogJd2tcv2E4EogPLL8oG77GItNc/i6jy4TLUjU28WKOMiBvYA/1rhb7f/DEQgj7DtIHP/rQGKH8goUdJfqGbk7EawP7FSxC2Y= - secure: S0l5RmsFJgbDdzXjHsCluexb1R9RklpxZMJgr9RcieeqSqaJDPUht53yBZDyuk04/KzEbtM5yxogJd2tcv2E4EogPLL8oG77GItNc/i6jy4TLUjU28WKOMiBvYA/1rhb7f/DEQgj7DtIHP/rQGKH8goUdJfqGbk7EawP7FSxC2Y=

View file

@ -14,7 +14,6 @@
// limitations under the License. // limitations under the License.
use std::fmt; use std::fmt;
use std::marker::PhantomFn;
use rust_num::{zero, one}; use rust_num::{zero, one};
@ -238,10 +237,7 @@ impl<S: BaseFloat + 'static> Transform3<S> for AffineMatrix3<S> {}
/// A trait that allows extracting components (rotation, translation, scale) /// A trait that allows extracting components (rotation, translation, scale)
/// from an arbitrary transformations /// from an arbitrary transformations
// PhantomFn works around a beta bug in deteriming the usage of S/P, and should be safely removed pub trait ToComponents<S: BaseNum, V: Vector<S>, P: Point<S, V>, R: Rotation<S, V, P>> {
// when PhantomFn deprecation lands in stable.
pub trait ToComponents<S: BaseNum, V: Vector<S>, P: Point<S, V>, R: Rotation<S, V, P>>
: PhantomFn<S> + PhantomFn<P> {
/// Extract the (scale, rotation, translation) triple /// Extract the (scale, rotation, translation) triple
fn decompose(&self) -> (V, R, V); fn decompose(&self) -> (V, R, V);
} }