Use relative dependencies inside cargo_rustc module

diff --git a/src/cargo/ops/cargo_rustc/context/compilation_files.rs b/src/cargo/ops/cargo_rustc/context/compilation_files.rs
index db844bccebb857dfa3cbc48e82d558fbe01c3a0e..95b5f638671f3b0b60a71e00ffcc9d339e355f38 100644 (file)
--- a/src/cargo/ops/cargo_rustc/context/compilation_files.rs
+++ b/src/cargo/ops/cargo_rustc/context/compilation_files.rs
@@ -8,9 +8,7 @@ use std::sync::Arc;
 use lazycell::LazyCell;
 
 use core::{TargetKind, Workspace};
-use ops::cargo_rustc::layout::Layout;
-use ops::cargo_rustc::FileFlavor;
-use ops::{Context, Kind, Unit};
+use super::{Context, FileFlavor, Kind, Layout, Unit};
 use util::{self, CargoResult};
 
 #[derive(Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]

diff --git a/src/cargo/ops/cargo_rustc/context/target_info.rs b/src/cargo/ops/cargo_rustc/context/target_info.rs
index 30978395324b09a61db03c4ae2ca1df2f834bc06..82d759692fad5ce9200b412627b2605373cca595 100644 (file)
--- a/src/cargo/ops/cargo_rustc/context/target_info.rs
+++ b/src/cargo/ops/cargo_rustc/context/target_info.rs
@@ -6,7 +6,7 @@ use std::str::{self, FromStr};
 use super::{env_args, Context};
 use util::{CargoResult, CargoResultExt, Cfg, ProcessBuilder};
 use core::TargetKind;
-use ops::Kind;
+use super::Kind;
 
 #[derive(Clone, Default)]
 pub struct TargetInfo {

diff --git a/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs b/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs
index 2fe20cde0d028e4f9e5497b0e82786b6d636a44c..d68037b551222bbdf7c1ec0dc0195bda2c531992 100644 (file)
--- a/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs
+++ b/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs
@@ -15,11 +15,10 @@
 //! (for example, with and without tests), so we actually build a dependency
 //! graph of `Unit`s, which capture these properties.
 
-use ops::Unit;
+use super::{Context, Kind, Unit};
 use std::collections::HashMap;
 use CargoResult;
 use core::dependency::Kind as DepKind;
-use ops::{Context, Kind};
 use core::Target;
 use core::Profile;
 

diff --git a/src/cargo/ops/cargo_rustc/output_depinfo.rs b/src/cargo/ops/cargo_rustc/output_depinfo.rs
index 8edcd185f17187986708904c3bab6fd045af0fa3..dcdbb95f8b7b22b84ac887e3a600246b1c635bd6 100644 (file)
--- a/src/cargo/ops/cargo_rustc/output_depinfo.rs
+++ b/src/cargo/ops/cargo_rustc/output_depinfo.rs
@@ -3,10 +3,9 @@ use std::io::{BufWriter, Write};
 use std::fs::File;
 use std::path::{Path, PathBuf};
 
-use ops::{Context, Unit};
+use super::{fingerprint, Context, Unit};
 use util::{internal, CargoResult};
 use util::paths;
-use ops::cargo_rustc::fingerprint;
 
 fn render_filename<P: AsRef<Path>>(path: P, basedir: Option<&str>) -> CargoResult<String> {
     let path = path.as_ref();