Merge pull request #2419 from topecongiro/core

Separate rustfmt into multiple crates

Author: nrc

Cargo.lock

@@ -1,58 +1,9 @@
-[package]
-
-name = "rustfmt-nightly"
-version = "0.3.8"
-authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
-description = "Tool to find and fix Rust formatting issues"
-repository = "https://github.com/rust-lang-nursery/rustfmt"
-readme = "README.md"
-license = "Apache-2.0/MIT"
-build = "build.rs"
-categories = ["development-tools"]
-
-[lib]
-doctest = false
-
-[[bin]]
-name = "rustfmt"
-
-[[bin]]
-name = "cargo-fmt"
-
-[[bin]]
-name = "rustfmt-format-diff"
-
-[[bin]]
-name = "git-rustfmt"
-
-[features]
-default = ["cargo-fmt", "rustfmt-format-diff"]
-cargo-fmt = []
-rustfmt-format-diff = []
-
-[dependencies]
-toml = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-unicode-segmentation = "1.0.0"
-regex = "0.2"
-term = "0.4"
-diff = "0.1"
-log = "0.3"
-env_logger = "0.4"
-getopts = "0.2"
-derive-new = "0.5"
-cargo_metadata = "0.4"
-rustc-ap-syntax = "29.0.0"
-rustc-ap-rustc_errors = "29.0.0"
-
-[dev-dependencies]
-lazy_static = "1.0.0"
-
-[target.'cfg(unix)'.dependencies]
-libc = "0.2.11"
-
-[target.'cfg(windows)'.dependencies]
-kernel32-sys = "0.2.2"
-winapi = "0.2.7"
+[workspace]
+members = [
+    "cargo-fmt",
+    "git-rustfmt",
+    "rustfmt-bin",
+    "rustfmt-config",
+    "rustfmt-core",
+    "rustfmt-format-diff",
+]

Cargo.toml

@@ -47,9 +47,6 @@ install:
 # ???
 build: false
 
-# Build rustfmt, run the executables as
 test_script:
   - cargo build --verbose
-  - cargo run --bin rustfmt -- --help
-  - cargo run --bin cargo-fmt -- --help
   - cargo test

appveyor.yml

@@ -0,0 +1,17 @@
+[package]
+name = "cargo-fmt"
+version = "0.4.0"
+authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
+description = "Cargo frontend for rustfmt"
+repository = "https://github.com/rust-lang-nursery/rustfmt"
+readme = "README.md"
+license = "Apache-2.0/MIT"
+categories = ["development-tools"]
+
+[[bin]]
+name = "cargo-fmt"
+
+[dependencies]
+cargo_metadata = "0.4"
+getopts = "0.2"
+serde_json = "1.0"

cargo-fmt/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "git-rustfmt"
+version = "0.4.0"
+authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
+description = "Run rustfmt against git diff"
+repository = "https://github.com/rust-lang-nursery/rustfmt"
+readme = "README.md"
+license = "Apache-2.0/MIT"
+categories = ["development-tools"]
+
+[[bin]]
+name = "git-rustfmt"
+
+[dependencies]
+env_logger = "0.4"
+getopts = "0.2"
+log = "0.3"
+rustfmt-config = { path = "../rustfmt-config" }
+rustfmt-core = { path = "../rustfmt-core" }

src/bin/cargo-fmt.rs renamed to cargo-fmt/src/main.rs

@@ -1,8 +1,19 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 extern crate env_logger;
 extern crate getopts;
 #[macro_use]
 extern crate log;
-extern crate rustfmt_nightly as rustfmt;
+extern crate rustfmt_config as config;
+extern crate rustfmt_core as rustfmt;
 
 use std::env;
 use std::path::{Path, PathBuf};
@@ -12,7 +23,6 @@ use std::str::FromStr;
 use getopts::{Matches, Options};
 
 use rustfmt::{run, Input};
-use rustfmt::config;
 
 fn prune_files(files: Vec<&str>) -> Vec<&str> {
     let prefixes: Vec<_> = files

git-rustfmt/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "rustfmt-bin"
+version = "0.4.0"
+authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
+description = "Tool to find and fix Rust formatting issues"
+repository = "https://github.com/rust-lang-nursery/rustfmt"
+readme = "README.md"
+license = "Apache-2.0/MIT"
+build = "build.rs"
+categories = ["development-tools"]
+
+[[bin]]
+name = "rustfmt"
+path = "src/main.rs"
+
+[dependencies]
+env_logger = "0.4"
+getopts = "0.2"
+rustfmt-config = { path = "../rustfmt-config" }
+rustfmt-core = { path = "../rustfmt-core" }

src/bin/git-rustfmt.rs renamed to git-rustfmt/src/main.rs

@@ -0,0 +1,49 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+use std::process::Command;
+
+fn main() {
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+
+    File::create(out_dir.join("commit-info.txt"))
+        .unwrap()
+        .write_all(commit_info().as_bytes())
+        .unwrap();
+}
+
+// Try to get hash and date of the last commit on a best effort basis. If anything goes wrong
+// (git not installed or if this is not a git repository) just return an empty string.
+fn commit_info() -> String {
+    match (commit_hash(), commit_date()) {
+        (Some(hash), Some(date)) => format!(" ({} {})", hash.trim_right(), date),
+        _ => String::new(),
+    }
+}
+
+fn commit_hash() -> Option<String> {
+    Command::new("git")
+        .args(&["rev-parse", "--short", "HEAD"])
+        .output()
+        .ok()
+        .and_then(|r| String::from_utf8(r.stdout).ok())
+}
+
+fn commit_date() -> Option<String> {
+    Command::new("git")
+        .args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
+        .output()
+        .ok()
+        .and_then(|r| String::from_utf8(r.stdout).ok())
+}