From 1bb30e7783d5c8350bcc37fb89d22dc384cc3d87 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.

---
 src/geometry/quaternion.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.