diff --git a/lib/codegen/src/binemit/relaxation.rs b/lib/codegen/src/binemit/relaxation.rs index 3c4e631bfc..7cfb6491ca 100644 --- a/lib/codegen/src/binemit/relaxation.rs +++ b/lib/codegen/src/binemit/relaxation.rs @@ -32,7 +32,7 @@ use cursor::{Cursor, FuncCursor}; use ir::{Function, InstructionData, Opcode}; use isa::{EncInfo, TargetIsa}; use iterators::IteratorExtras; -use result::CodegenResult; +use CodegenResult; /// Relax branches and compute the final layout of EBB headers in `func`. /// diff --git a/lib/codegen/src/lib.rs b/lib/codegen/src/lib.rs index 0c7eb52989..d892ecffe9 100644 --- a/lib/codegen/src/lib.rs +++ b/lib/codegen/src/lib.rs @@ -75,7 +75,6 @@ pub mod ir; pub mod isa; pub mod loop_analysis; pub mod print_errors; -pub mod result; pub mod settings; pub mod timing; pub mod verifier; @@ -99,6 +98,7 @@ mod predicates; mod preopt; mod ref_slice; mod regalloc; +mod result; mod scoped_hash_map; mod simple_gvn; mod stack_layout; @@ -106,6 +106,8 @@ mod topo_order; mod unreachable_code; mod write; +pub use result::{CodegenError, CodegenResult}; + /// This replaces `std` in builds with `core`. #[cfg(not(feature = "std"))] mod std { diff --git a/lib/module/src/module.rs b/lib/module/src/module.rs index 74eb1aaf42..a01d58ffdf 100644 --- a/lib/module/src/module.rs +++ b/lib/module/src/module.rs @@ -6,8 +6,7 @@ // shared with `DataContext`? use cretonne_codegen::entity::{EntityRef, PrimaryMap}; -use cretonne_codegen::result::CodegenError; -use cretonne_codegen::{binemit, ir, Context}; +use cretonne_codegen::{binemit, ir, CodegenError, Context}; use data_context::DataContext; use std::borrow::ToOwned; use std::collections::HashMap;