From 8262a63e8ede9987affc7aa92db2f24cd5ab1cb0 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 5 Jun 2020 20:07:52 -0700 Subject: [PATCH] Update imports in lexical module --- src/lexical/bhcomp.rs | 2 +- src/lexical/errors.rs | 6 +++--- src/lexical/math.rs | 12 ++++++------ src/lexical/num.rs | 2 +- src/lexical/rounding.rs | 2 +- src/lexical/shift.rs | 2 +- src/lexical/slice.rs | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lexical/bhcomp.rs b/src/lexical/bhcomp.rs index d138f4a..573b0a3 100644 --- a/src/lexical/bhcomp.rs +++ b/src/lexical/bhcomp.rs @@ -7,10 +7,10 @@ use super::bignum::*; use super::digit::*; use super::exponent::*; use super::float::*; +use super::lib::{cmp, mem}; use super::math::*; use super::num::*; use super::rounding::*; -use crate::lib::{cmp, mem}; // MANTISSA diff --git a/src/lexical/errors.rs b/src/lexical/errors.rs index 8eef1cc..ccbb352 100644 --- a/src/lexical/errors.rs +++ b/src/lexical/errors.rs @@ -6,9 +6,9 @@ //! found here: //! https://golang.org/src/strconv/atof.go -use crate::float::*; -use crate::num::*; -use crate::rounding::*; +use super::float::*; +use super::num::*; +use super::rounding::*; pub(crate) trait FloatErrors { /// Get the full error scale. diff --git a/src/lexical/math.rs b/src/lexical/math.rs index e0b0669..c4c90c3 100644 --- a/src/lexical/math.rs +++ b/src/lexical/math.rs @@ -4,11 +4,11 @@ //! buffers, so for a `vec![0, 1, 2, 3]`, `3` is the most significant limb, //! and `0` is the least significant limb. -use crate::large_powers; -use crate::lib::{cmp, iter, mem, ptr}; -use crate::num::*; -use crate::slice::*; -use crate::small_powers::*; +use super::large_powers; +use super::lib::{cmp, iter, mem, ptr}; +use super::num::*; +use super::slice::*; +use super::small_powers::*; // ALIASES // ------- @@ -69,7 +69,7 @@ pub(crate) type LimbVecType = arrayvec::ArrayVec<[Limb; 128]>; pub(crate) type LimbVecType = arrayvec::ArrayVec<[Limb; 64]>; #[cfg(not(no_alloc))] -pub(crate) type LimbVecType = crate::lib::Vec; +pub(crate) type LimbVecType = super::lib::Vec; /// Cast to limb type. #[inline(always)] diff --git a/src/lexical/num.rs b/src/lexical/num.rs index 151339c..bee7839 100644 --- a/src/lexical/num.rs +++ b/src/lexical/num.rs @@ -1,6 +1,6 @@ //! Utilities for Rust numbers. -use crate::lib::ops; +use super::lib::ops; /// Precalculated values of radix**i for i in range [0, arr.len()-1]. /// Each value can be **exactly** represented as that type. diff --git a/src/lexical/rounding.rs b/src/lexical/rounding.rs index 29b5946..d1b9cea 100644 --- a/src/lexical/rounding.rs +++ b/src/lexical/rounding.rs @@ -1,9 +1,9 @@ //! Defines rounding schemes for floating-point numbers. use super::float::ExtendedFloat; +use super::lib::mem; use super::num::*; use super::shift::*; -use crate::lib::mem; // MASKS diff --git a/src/lexical/shift.rs b/src/lexical/shift.rs index 9446d71..efbef7e 100644 --- a/src/lexical/shift.rs +++ b/src/lexical/shift.rs @@ -1,7 +1,7 @@ //! Bit-shift helpers. use super::float::ExtendedFloat; -use crate::lib::mem; +use super::lib::mem; // Shift extended-precision float right `shift` bytes. #[inline] diff --git a/src/lexical/slice.rs b/src/lexical/slice.rs index e912c8e..9d9e1e2 100644 --- a/src/lexical/slice.rs +++ b/src/lexical/slice.rs @@ -1,6 +1,6 @@ //! Traits to accept generic slices. -use crate::lib::ops; +use super::lib::ops; // RSLICE INDEX @@ -141,7 +141,7 @@ impl Slice for arrayvec::ArrayVec { } #[cfg(not(no_alloc))] -impl Slice for crate::lib::Vec { +impl Slice for super::lib::Vec { #[inline] fn as_slice(&self) -> &[T] { self