Fix imports for conditional compilation

Author: andyleiserson

naga/src/back/pipeline_constants.rs

@@ -10,10 +10,9 @@ use thiserror::Error;
 use super::PipelineConstants;
 use crate::{
     arena::HandleVec,
-    compact::compact,
     ir,
     proc::{ConstantEvaluator, ConstantEvaluatorError, Emitter},
-    valid::{Capabilities, ModuleInfo, ValidationError, ValidationFlags, Validator},
+    valid::ValidationError,
     Arena, Block, Constant, Expression, Function, Handle, Literal, Module, Override, Range, Scalar,
     Span, Statement, TypeInner, WithSpan,
 };
@@ -64,10 +63,12 @@ pub enum PipelineConstantError {
 #[cfg(feature = "compact")]
 pub fn process_overrides<'a>(
     module: &'a Module,
-    module_info: &'a ModuleInfo,
+    module_info: &'a crate::valid::ModuleInfo,
     entry_point: Option<(ir::ShaderStage, &str)>,
     pipeline_constants: &PipelineConstants,
-) -> Result<(Cow<'a, Module>, Cow<'a, ModuleInfo>), PipelineConstantError> {
+) -> Result<(Cow<'a, Module>, Cow<'a, crate::valid::ModuleInfo>), PipelineConstantError> {
+    use crate::valid::{Capabilities, ValidationFlags, Validator};
+
     if module.overrides.is_empty() {
         return Ok((Cow::Borrowed(module), Cow::Borrowed(module_info)));
     }
@@ -82,7 +83,7 @@ pub fn process_overrides<'a>(
             .entry_points
             .retain(|ep| ep.stage == ep_stage && ep.name == ep_name);
     }
-    compact(&mut module, false);
+    crate::compact::compact(&mut module, false);
 
     // A map from override handles to the handles of the constants
     // we've replaced them with.