Rename CargoMode to XargoMode

Author: Aaron1011

src/bin/xargo-check.rs

@@ -1,3 +1,3 @@
 fn main() {
-    xargo::main_inner(xargo::CargoMode::Check);
+    xargo::main_inner(xargo::XargoMode::Check);
 }

src/bin/xargo.rs

@@ -1,3 +1,3 @@
 fn main() {
-    xargo::main_inner(xargo::CargoMode::Build);
+    xargo::main_inner(xargo::XargoMode::Build);
 }

src/cargo.rs

@@ -10,7 +10,7 @@ use cli::Args;
 use errors::*;
 use extensions::CommandExt;
 use util;
-use sysroot::CargoMode;
+use sysroot::XargoMode;
 use xargo::Home;
 
 pub struct Rustflags {
@@ -248,11 +248,11 @@ impl Root {
     }
 }
 
-pub fn root(mode: CargoMode) -> Result<Option<Root>> {
+pub fn root(mode: XargoMode) -> Result<Option<Root>> {
     // Don't require a 'Cargo.toml' to exist when 'xargo-check' is used
     let name = match mode {
-        CargoMode::Build => "Cargo.toml",
-        CargoMode::Check => "Xargo.toml"
+        XargoMode::Build => "Cargo.toml",
+        XargoMode::Check => "Xargo.toml"
     };
     let cd = env::current_dir().chain_err(|| "couldn't get the current directory")?;
 

src/lib.rs

@@ -33,7 +33,7 @@ mod sysroot;
 mod util;
 mod xargo;
 
-pub use sysroot::CargoMode;
+pub use sysroot::XargoMode;
 
 // We use a different sysroot for Native compilation to avoid file locking
 //
@@ -74,12 +74,12 @@ impl CompilationMode {
     }
 }
 
-pub fn main_inner(cargo_mode: CargoMode) {
+pub fn main_inner(xargo_mode: XargoMode) {
     fn show_backtrace() -> bool {
         env::var("RUST_BACKTRACE").as_ref().map(|s| &s[..]) == Ok("1")
     }
 
-    match run(cargo_mode) {
+    match run(xargo_mode) {
         Err(e) => {
             let stderr = io::stderr();
             let mut stderr = stderr.lock();
@@ -107,7 +107,7 @@ pub fn main_inner(cargo_mode: CargoMode) {
     }
 }
 
-fn run(cargo_mode: CargoMode) -> Result<Option<ExitStatus>> {
+fn run(cargo_mode: XargoMode) -> Result<Option<ExitStatus>> {
     let args = cli::args();
     let verbose = args.verbose();
 
@@ -194,7 +194,7 @@ fn run(cargo_mode: CargoMode) -> Result<Option<ExitStatus>> {
                 cargo_mode,
             )?;
 
-            if args.subcommand().is_some() || cargo_mode == CargoMode::Build {
+            if args.subcommand().is_some() || cargo_mode == XargoMode::Build {
                 return xargo::run(
                     &args,
                     &cmode,

src/sysroot.rs

@@ -39,7 +39,7 @@ fn build(
     hash: u64,
     verbose: bool,
     message_format: Option<&str>,
-    cargo_mode: CargoMode,
+    cargo_mode: XargoMode,
 ) -> Result<()> {
     const TOML: &'static str = r#"
 [package]
@@ -169,8 +169,8 @@ version = "0.0.0"
             }
 
             match cargo_mode {
-                CargoMode::Build => cmd.arg("build"),
-                CargoMode::Check => cmd.arg("check")
+                XargoMode::Build => cmd.arg("build"),
+                XargoMode::Check => cmd.arg("check")
             };
 
             match () {
@@ -274,11 +274,11 @@ pub fn update(
     sysroot: &Sysroot,
     verbose: bool,
     message_format: Option<&str>,
-    cargo_mode: CargoMode,
+    cargo_mode: XargoMode,
 ) -> Result<()> {
     let ctoml = match cargo_mode {
-        CargoMode::Build => Some(cargo::toml(root)?),
-        CargoMode::Check => {
+        XargoMode::Build => Some(cargo::toml(root)?),
+        XargoMode::Check => {
             if root.path().join("Cargo.toml").exists() {
                 Some(cargo::toml(root)?)
             } else {
@@ -367,7 +367,7 @@ pub struct Stage {
 /// Which mode to invoke `cargo` in when building the sysroot
 /// Can be either `cargo build` or `cargo check`
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum CargoMode {
+pub enum XargoMode {
     Build,
     Check,
 }