Fix merge errors due to the switch to rust 2018.
This commit is contained in:
parent
38ef0cbf7b
commit
ba40e8eb55
|
@ -64,8 +64,5 @@ name = "nalgebra_bench"
|
|||
harness = false
|
||||
path = "benches/lib.rs"
|
||||
|
||||
[patch.crates-io]
|
||||
alga = { path = "../alga/alga" }
|
||||
|
||||
[profile.bench]
|
||||
lto = true
|
||||
|
|
|
@ -591,13 +591,13 @@ impl<N: RealField> Quaternion<N> {
|
|||
/// Divides quaternion into two.
|
||||
#[inline]
|
||||
pub fn half(&self) -> Self {
|
||||
self / ::convert(2.0f64)
|
||||
self / crate::convert(2.0f64)
|
||||
}
|
||||
|
||||
/// Calculates square root.
|
||||
#[inline]
|
||||
pub fn sqrt(&self) -> Self {
|
||||
self.powf(::convert(0.5))
|
||||
self.powf(crate::convert(0.5))
|
||||
}
|
||||
|
||||
/// Check if the quaternion is pure.
|
||||
|
|
|
@ -352,7 +352,7 @@ where DefaultAllocator: Allocator<N, D, D>
|
|||
}
|
||||
}
|
||||
|
||||
impl<N: Real, D: DimName> Rotation<N, D>
|
||||
impl<N: RealField, D: DimName> Rotation<N, D>
|
||||
where DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>
|
||||
{
|
||||
/// Rotate the given point.
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
use base::allocator::Allocator;
|
||||
use base::default_allocator::DefaultAllocator;
|
||||
use base::dimension::{Dim, DimAdd, DimDiff, DimMax, DimMaximum, DimSub, DimSum};
|
||||
use std::cmp;
|
||||
use storage::Storage;
|
||||
use {zero, Real, Vector, VectorN, U1};
|
||||
|
||||
impl<N: Real, D1: Dim, S1: Storage<N, D1>> Vector<N, D1, S1> {
|
||||
use crate::base::allocator::Allocator;
|
||||
use crate::base::default_allocator::DefaultAllocator;
|
||||
use crate::base::dimension::{Dim, DimAdd, DimDiff, DimMax, DimMaximum, DimSub, DimSum};
|
||||
use crate::storage::Storage;
|
||||
use crate::{zero, RealField, Vector, VectorN, U1};
|
||||
|
||||
impl<N: RealField, D1: Dim, S1: Storage<N, D1>> Vector<N, D1, S1> {
|
||||
/// Returns the convolution of the target vector and a kernel
|
||||
///
|
||||
/// # Arguments
|
||||
|
|
Loading…
Reference in New Issue