Revert "break c2rust dependency on c2rust-refactor"

This reverts commit 2bd339d.

Author: fw-immunant

Cargo.lock

@@ -464,8 +464,43 @@ fn get_extra_args_macos() -> Vec<String> {
     args
 }
 
-fn invoke_refactor(_build_dir: &Path) -> Result<(), Error> {
-    Ok(())
+fn invoke_refactor(build_dir: &Path) -> Result<(), Error> {
+    // Make sure the crate builds cleanly
+    let status = process::Command::new("cargo")
+        .args(&["check"])
+        .env("RUSTFLAGS", "-Awarnings")
+        .current_dir(build_dir)
+        .status()?;
+    if !status.success() {
+        return Err(failure::format_err!("Crate does not compile."));
+    }
+
+    // Assumes the subcommand executable is in the same directory as this program.
+    let cmd_path = std::env::current_exe().expect("Cannot get current executable path");
+    let mut cmd_path = cmd_path.as_path().canonicalize().unwrap();
+    cmd_path.pop(); // remove current executable
+    cmd_path.push(format!("c2rust-refactor"));
+    assert!(cmd_path.exists(), "{:?} is missing", cmd_path);
+    let args = [
+        "--cargo",
+        "--rewrite-mode",
+        "inplace",
+        "rename_unnamed",
+        ";",
+        "reorganize_definitions",
+    ];
+    let status = process::Command::new(cmd_path.into_os_string())
+        .args(&args)
+        .current_dir(build_dir)
+        .status()?;
+    if status.success() {
+        Ok(())
+    } else {
+        Err(failure::format_err!(
+            "Refactoring failed. Please fix errors above and re-run:\n    c2rust refactor {}",
+            args.join(" "),
+        ))
+    }
 }
 
 fn reorganize_definitions(

c2rust-transpile/src/lib.rs

@@ -21,10 +21,12 @@ log = "0.4"
 regex = "1.3"
 shlex = "1.3"
 c2rust-transpile = { version = "0.21.0", path = "../c2rust-transpile" }
+c2rust-refactor = { version = "0.21.0", path = "../c2rust-refactor" }
 
 [build-dependencies]
 c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.21.0" }
 
 [features]
 # Force static linking of LLVM
 llvm-static = ["c2rust-transpile/llvm-static"]
+profile = ["c2rust-refactor/profile"]

c2rust/Cargo.toml

@@ -1,5 +1,12 @@
-use clap::{load_yaml, App, ArgMatches};
-use log::info;
+extern crate env_logger;
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate clap;
+extern crate c2rust_refactor;
+extern crate shlex;
+
+use clap::{App, ArgMatches};
 use std::fs::File;
 use std::io::Read;
 use std::process;

c2rust-refactor/src/bin/c2rust-refactor.rs renamed to c2rust/src/bin/c2rust-refactor.rs

@@ -60,7 +60,7 @@ impl SubCommand {
     /// Get all known [`SubCommand`]s.  These have no [`SubCommand::path`].
     /// Even if the subcommand executables aren't there, we can still suggest them.
     pub fn known() -> impl Iterator<Item = Self> {
-        ["transpile", "instrument", "pdg", "analyze"]
+        ["transpile", "refactor", "instrument", "pdg", "analyze"]
             .into_iter()
             .map(|name| Self {
                 path: None,