Try to depend only on the ir module being in scope.

Generated code should used qualified names assuming that `ir` is in
scope, not everything else.

lib/cretonne/src/ir/instructions.rs

@@ -10,6 +10,7 @@ use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use std::ops::{Deref, DerefMut};
 
+use ir;
 use ir::{Value, Type, Ebb, JumpTable, SigRef, FuncRef, StackSlot, MemFlags};
 use ir::immediates::{Imm64, Uimm8, Ieee32, Ieee64, Offset32, Uoffset32};
 use ir::condcodes::*;

lib/cretonne/src/isa/arm32/enc_tables.rs

@@ -1,6 +1,6 @@
 //! Encoding tables for ARM32 ISA.
 
-use ir::types;
+use ir;
 use isa;
 use isa::constraints::*;
 use isa::enc_tables::*;

lib/cretonne/src/isa/arm64/enc_tables.rs

@@ -1,6 +1,6 @@
 //! Encoding tables for ARM64 ISA.
 
-use ir::types;
+use ir;
 use isa;
 use isa::constraints::*;
 use isa::enc_tables::*;

lib/cretonne/src/isa/intel/enc_tables.rs

@@ -1,6 +1,6 @@
 //! Encoding tables for Intel ISAs.
 
-use ir::{self, types, Opcode};
+use ir;
 use isa;
 use isa::constraints::*;
 use isa::enc_tables::*;

lib/cretonne/src/isa/riscv/enc_tables.rs

@@ -1,7 +1,7 @@
 //! Encoding tables for RISC-V.
 
 use ir::condcodes::IntCC;
-use ir::{self, types, Opcode};
+use ir;
 use isa;
 use isa::constraints::*;
 use isa::enc_tables::*;

lib/cretonne/src/legalizer/mod.rs

@@ -19,7 +19,6 @@ use ir::{self, Function, Cursor};
 use ir::condcodes::IntCC;
 use isa::TargetIsa;
 use bitset::BitSet;
-use ir::instructions::ValueTypeSet;
 
 mod boundary;
 mod split;