Adds command xrustc (#9)

Author: qqwa

Cargo.toml

@@ -10,6 +10,9 @@ name = "cargo-xbuild"
 repository = "https://github.com/rust-osdev/cargo-xbuild"
 version = "0.4.7"
 
+[lib]
+name = "xargo_lib"
+
 [dependencies]
 error-chain = "0.7.2"
 fs2 = "0.4.1"

src/bin/cargo-xbuild.rs

@@ -0,0 +1,5 @@
+extern crate xargo_lib;
+
+pub fn main() {
+    xargo_lib::main_common("build");
+}

src/bin/cargo-xrustc.rs

@@ -0,0 +1,5 @@
+extern crate xargo_lib;
+
+pub fn main() {
+    xargo_lib::main_common("rustc");
+}

src/cli.rs

@@ -27,10 +27,10 @@ impl Args {
     }
 }
 
-pub fn args() -> Result<(Command, Args), String> {
+pub fn args(command_name: &str) -> Result<(Command, Args), String> {
     let mut args = env::args().skip(1);
-    if args.next() != Some("xbuild".into()) {
-        Err("must be invoked as cargo subcommand: `cargo xbuild`")?;
+    if args.next() != Some("x".to_string() + command_name) {
+        Err(format!("must be invoked as cargo subcommand: `cargo x{}`", command_name))?;
     }
     let all = args.collect::<Vec<_>>();
     let command = match all.first().map(|s| s.as_str()) {

src/help.txt

@@ -1,14 +1,14 @@
-Wrapper for `cargo build` that cross-compiles core, compiler_builtins and alloc
+Wrapper for `cargo {command_name}` that cross-compiles core, compiler_builtins and alloc
 
 USAGE:
-    cargo xbuild [OPTIONS]
+    cargo x{command_name} [OPTIONS]
 
 OPTIONS:
     -h, --help      Prints help information and exit
     ---version      Prints version information and exit
 
-    Any additional options are directly passed to `cargo build` (see
-    `cargo build --help` for possible options).
+    Any additional options are directly passed to `cargo {command_name}` (see
+    `cargo {command_name} --help` for possible options).
 
 CONFIGURATION:
     Configuration is possible through a `package.metadata.cargo-xbuild` table

src/main.rs renamed to src/lib.rs

@@ -34,8 +34,6 @@ mod sysroot;
 mod util;
 mod xargo;
 
-const HELP: &str = include_str!("help.txt");
-
 // We use a different sysroot for Native compilation to avoid file locking
 //
 // Cross compilation requires `lib/rustlib/$HOST` to match `rustc`'s sysroot,
@@ -84,12 +82,12 @@ impl CompilationMode {
     }
 }
 
-pub fn main() {
+pub fn main_common(command_name: &str) {
     fn show_backtrace() -> bool {
         env::var("RUST_BACKTRACE").as_ref().map(|s| &s[..]) == Ok("1")
     }
 
-    match run() {
+    match run(command_name) {
         Err(e) => {
             let stderr = io::stderr();
             let mut stderr = stderr.lock();
@@ -117,14 +115,14 @@ pub fn main() {
     }
 }
 
-fn run() -> Result<Option<ExitStatus>> {
+fn run(command_name: &str) -> Result<Option<ExitStatus>> {
     use cli::Command;
 
-    let (command, args) = cli::args()?;
+    let (command, args) = cli::args(command_name)?;
     match command {
-        Command::Build => Ok(Some(build(args)?)),
+        Command::Build => Ok(Some(build(args, command_name)?)),
         Command::Help => {
-            print!("{}", HELP);
+            print!(include_str!("help.txt"), command_name = command_name);
             Ok(None)
         }
         Command::Version => {
@@ -138,7 +136,7 @@ fn run() -> Result<Option<ExitStatus>> {
     }
 }
 
-fn build(args: cli::Args) -> Result<(ExitStatus)> {
+fn build(args: cli::Args, command_name: &str) -> Result<(ExitStatus)> {
     let verbose = args.verbose();
     let meta = rustc::version();
     let cd = CurrentDirectory::get()?;
@@ -206,7 +204,7 @@ fn build(args: cli::Args) -> Result<(ExitStatus)> {
             &sysroot,
             verbose,
         )?;
-        return xargo::run(&args, &cmode, rustflags, &home, &meta, verbose);
+        return xargo::run(&args, &cmode, rustflags, &home, &meta, command_name, verbose);
     }
 
     cargo::run(&args, verbose)

src/xargo.rs

@@ -20,10 +20,11 @@ pub fn run(
     rustflags: Rustflags,
     home: &Home,
     meta: &VersionMeta,
+    command_name: &str,
     verbose: bool,
 ) -> Result<ExitStatus> {
     let mut cmd = Command::new("cargo");
-    cmd.arg("build");
+    cmd.arg(command_name);
     cmd.args(args.all());
 
     let flags = rustflags.for_xargo(home);