From ba40e8eb55e1ab0096996bc5d4efc7ba6203a123 Mon Sep 17 00:00:00 2001
From: sebcrozet <developer@crozet.re>
Date: Sun, 31 Mar 2019 10:53:11 +0200
Subject: [PATCH] Fix merge errors due to the switch to rust 2018.

---
 Cargo.toml                 |  3 ---
 src/geometry/quaternion.rs |  4 ++--
 src/geometry/rotation.rs   |  2 +-
 src/linalg/convolution.rs  | 13 +++++++------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7c1f4b1ad..424c4483d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,8 +64,5 @@ name = "nalgebra_bench"
 harness = false
 path = "benches/lib.rs"
 
-[patch.crates-io]
-alga = { path = "../alga/alga" }
-
 [profile.bench]
 lto = true
diff --git a/src/geometry/quaternion.rs b/src/geometry/quaternion.rs
index 208145d79..2986dc12c 100755
--- a/src/geometry/quaternion.rs
+++ b/src/geometry/quaternion.rs
@@ -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.
diff --git a/src/geometry/rotation.rs b/src/geometry/rotation.rs
index 63ba0279c..ec9c8150b 100755
--- a/src/geometry/rotation.rs
+++ b/src/geometry/rotation.rs
@@ -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.
diff --git a/src/linalg/convolution.rs b/src/linalg/convolution.rs
index b121b34ab..3f934eda1 100644
--- a/src/linalg/convolution.rs
+++ b/src/linalg/convolution.rs
@@ -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