Address clippy::upper_case_acronyms

unageek · Feb 20, 2021 · fa547d4 · fa547d4
1 parent 8882611
commit fa547d4
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 71 deletions.
diff --git a/src/absmax.rs b/src/absmax.rs
@@ -89,8 +89,8 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn empty() {

diff --git a/src/arith.rs b/src/arith.rs
@@ -319,8 +319,8 @@ impl_op_assign!(DivAssign, div_assign, div);
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn add_assign() {

diff --git a/src/basic.rs b/src/basic.rs
@@ -233,8 +233,8 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn empty() {

diff --git a/src/bytes.rs b/src/bytes.rs
@@ -127,9 +127,9 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type D = Decoration;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Decoration as D;
+    use Interval as I;
 
     #[test]
     fn interval() {

diff --git a/src/classify.rs b/src/classify.rs
@@ -114,7 +114,7 @@ pub(crate) enum IntervalClass2 {
 mod tests {
     use super::*;
     use crate::*;
-    type I = Interval;
+    use Interval as I;
 
     #[test]
     fn classify() {

diff --git a/src/constants.rs b/src/constants.rs
@@ -103,8 +103,8 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type I = Interval;
-    type DI = DecInterval;
+    use DecInterval as DI;
+    use Interval as I;
 
     // This only works with positive numbers.
     fn succ(x: f64) -> f64 {

diff --git a/src/elementary.rs b/src/elementary.rs
@@ -782,8 +782,8 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn nai() {

diff --git a/src/format.rs b/src/format.rs
@@ -101,9 +101,9 @@ impl fmt::LowerHex for DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type D = Decoration;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Decoration as D;
+    use Interval as I;
 
     #[test]
     fn format() {

diff --git a/src/integer.rs b/src/integer.rs
@@ -223,8 +223,8 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn empty() {

diff --git a/src/overlap.rs b/src/overlap.rs
@@ -283,7 +283,7 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
+    use DecInterval as DI;
 
     #[test]
     fn nai() {

diff --git a/src/parse.rs b/src/parse.rs
@@ -659,8 +659,8 @@ impl Interval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn parse() {

diff --git a/src/set_op.rs b/src/set_op.rs
@@ -67,8 +67,8 @@ impl DecInterval {
 #[cfg(test)]
 mod tests {
     use crate::*;
-    type DI = DecInterval;
-    type I = Interval;
+    use DecInterval as DI;
+    use Interval as I;
 
     #[test]
     fn empty() {

diff --git a/tests/itf1788.rs b/tests/itf1788.rs
@@ -1,12 +1,13 @@
-#![allow(
+use inari::*;
+
+#[allow(
+    unused_attributes,
+    unused_imports,
     clippy::approx_constant,
     clippy::eq_op,
     clippy::excessive_precision,
     clippy::float_cmp
 )]
-
-use inari::*;
-
 mod itf1788_tests {
     //mod abs_rev;
     mod atan2;
@@ -75,6 +76,7 @@ impl Eq2 for Interval {}
 impl Eq2 for Overlap {}
 
 impl Eq2 for f64 {
+    #[allow(clippy::float_cmp)]
     fn eq2(&self, rhs: &Self) -> bool {
         self.is_nan() && rhs.is_nan() || self == rhs
     }

diff --git a/tests/itf1788_tests/atan2.rs b/tests/itf1788_tests/atan2.rs
@@ -12,15 +12,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[cfg(feature = "gmp")]
 #[test]

diff --git a/tests/itf1788_tests/c_xsc.rs b/tests/itf1788_tests/c_xsc.rs
@@ -26,15 +26,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 // Tests A+B, B+A, A-B, B-A, -A, +A
 #[test]

diff --git a/tests/itf1788_tests/fi_lib.rs b/tests/itf1788_tests/fi_lib.rs
@@ -30,14 +30,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn fi_lib_addii() {

diff --git a/tests/itf1788_tests/ieee1788_constructors.rs b/tests/itf1788_tests/ieee1788_constructors.rs
@@ -12,17 +12,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 // According to the examples in Section 7.4.2, unbounded intervals can be constructed with non-common inputs.
 #[test]

diff --git a/tests/itf1788_tests/ieee1788_exceptions.rs b/tests/itf1788_tests/ieee1788_exceptions.rs
@@ -12,16 +12,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[cfg(feature = "gmp")]
 #[test]

diff --git a/tests/itf1788_tests/libieeep1788_bool.rs b/tests/itf1788_tests/libieeep1788_bool.rs
@@ -22,17 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_is_empty_test() {

diff --git a/tests/itf1788_tests/libieeep1788_class.rs b/tests/itf1788_tests/libieeep1788_class.rs
@@ -22,17 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_nums_to_interval_test() {

diff --git a/tests/itf1788_tests/libieeep1788_elem.rs b/tests/itf1788_tests/libieeep1788_elem.rs
@@ -22,17 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_neg_test() {

diff --git a/tests/itf1788_tests/libieeep1788_num.rs b/tests/itf1788_tests/libieeep1788_num.rs
@@ -22,17 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_inf_test() {

diff --git a/tests/itf1788_tests/libieeep1788_overlap.rs b/tests/itf1788_tests/libieeep1788_overlap.rs
@@ -22,18 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
-type O = inari::Overlap;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_overlap_test() {

diff --git a/tests/itf1788_tests/libieeep1788_rec_bool.rs b/tests/itf1788_tests/libieeep1788_rec_bool.rs
@@ -22,17 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_is_common_interval_test() {

diff --git a/tests/itf1788_tests/libieeep1788_set.rs b/tests/itf1788_tests/libieeep1788_set.rs
@@ -22,17 +22,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type D = inari::Decoration;
-type DI = inari::DecInterval;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn minimal_intersection_test() {

diff --git a/tests/itf1788_tests/mpfi.rs b/tests/itf1788_tests/mpfi.rs
@@ -27,15 +27,14 @@
  */
 //Language imports
 #![rustfmt::skip]
-#![allow(unused_attributes, unused_imports)]
 
 //Test library imports
 
 //Arithmetic library imports
 
 //Preamble
 use crate::*;
-type I = inari::Interval;
+use inari::{DecInterval as DI, Decoration as D, Interval as I, Overlap as O};
 
 #[test]
 fn mpfi_abs() {