From 18a5386c083c1cefed2b486eec754d163e593a45 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Thu, 25 Apr 2019 16:54:52 +0200
Subject: [PATCH] Remove and reorganize IntCC/FloatCC imports to avoid a build
 warning;

---
 cranelift/codegen/src/isa/x86/enc_tables.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/cranelift/codegen/src/isa/x86/enc_tables.rs b/cranelift/codegen/src/isa/x86/enc_tables.rs
index 0ed238ac18..dd7bf02c86 100644
--- a/cranelift/codegen/src/isa/x86/enc_tables.rs
+++ b/cranelift/codegen/src/isa/x86/enc_tables.rs
@@ -4,7 +4,7 @@ use super::registers::*;
 use crate::bitset::BitSet;
 use crate::cursor::{Cursor, FuncCursor};
 use crate::flowgraph::ControlFlowGraph;
-use crate::ir::condcodes::IntCC;
+use crate::ir::condcodes::{FloatCC, IntCC};
 use crate::ir::{self, Function, Inst, InstBuilder};
 use crate::isa;
 use crate::isa::constraints::*;
@@ -280,8 +280,6 @@ fn expand_minmax(
     cfg: &mut ControlFlowGraph,
     _isa: &isa::TargetIsa,
 ) {
-    use crate::ir::condcodes::FloatCC;
-
     let (x, y, x86_opc, bitwise_opc) = match func.dfg[inst] {
         ir::InstructionData::Binary {
             opcode: ir::Opcode::Fmin,
@@ -374,8 +372,6 @@ fn expand_fcvt_from_uint(
     cfg: &mut ControlFlowGraph,
     _isa: &isa::TargetIsa,
 ) {
-    use crate::ir::condcodes::IntCC;
-
     let x;
     match func.dfg[inst] {
         ir::InstructionData::Unary {
@@ -447,7 +443,6 @@ fn expand_fcvt_to_sint(
     cfg: &mut ControlFlowGraph,
     _isa: &isa::TargetIsa,
 ) {
-    use crate::ir::condcodes::{FloatCC, IntCC};
     use crate::ir::immediates::{Ieee32, Ieee64};
 
     let x = match func.dfg[inst] {
@@ -543,7 +538,6 @@ fn expand_fcvt_to_sint_sat(
     cfg: &mut ControlFlowGraph,
     _isa: &isa::TargetIsa,
 ) {
-    use crate::ir::condcodes::{FloatCC, IntCC};
     use crate::ir::immediates::{Ieee32, Ieee64};
 
     let x = match func.dfg[inst] {
@@ -663,7 +657,6 @@ fn expand_fcvt_to_uint(
     cfg: &mut ControlFlowGraph,
     _isa: &isa::TargetIsa,
 ) {
-    use crate::ir::condcodes::{FloatCC, IntCC};
     use crate::ir::immediates::{Ieee32, Ieee64};
 
     let x = match func.dfg[inst] {
@@ -745,7 +738,6 @@ fn expand_fcvt_to_uint_sat(
     cfg: &mut ControlFlowGraph,
     _isa: &isa::TargetIsa,
 ) {
-    use crate::ir::condcodes::{FloatCC, IntCC};
     use crate::ir::immediates::{Ieee32, Ieee64};
 
     let x = match func.dfg[inst] {