From d33450247b17d92a951d9663822c5a3635a37dde Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 9 Jun 2019 22:29:36 +0900 Subject: [PATCH] Rename config_proc_macro to rustfmt-config_proc_macro --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- config_proc_macro/Cargo.lock | 20 ++++++++++---------- config_proc_macro/Cargo.toml | 6 +++++- src/config/lists.rs | 2 +- src/config/options.rs | 2 +- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b07550bd21..5bd8d006b4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,15 +156,6 @@ dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "config_proc_macro" -version = "0.1.0" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.35 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "constant_time_eq" version = "0.1.3" @@ -825,6 +816,15 @@ dependencies = [ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustfmt-config_proc_macro" +version = "0.1.0" +dependencies = [ + "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.35 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustfmt-nightly" version = "1.3.0" @@ -833,7 +833,6 @@ dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "cargo_metadata 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "config_proc_macro 0.1.0", "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -849,6 +848,7 @@ dependencies = [ "rustc-ap-syntax 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt-config_proc_macro 0.1.0", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 251399510ba..dd282f70a0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ ignore = "0.4.6" annotate-snippets = { version = "0.5.0", features = ["ansi_term"] } structopt = "0.2.15" -config_proc_macro = { path = "config_proc_macro" } +rustfmt-config_proc_macro = { version = "0.1", path = "config_proc_macro" } # A noop dependency that changes in the Rust repository, it's a bit of a hack. # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` diff --git a/config_proc_macro/Cargo.lock b/config_proc_macro/Cargo.lock index 6ee8e34b13f..f1efb8e7dfd 100644 --- a/config_proc_macro/Cargo.lock +++ b/config_proc_macro/Cargo.lock @@ -1,15 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "config_proc_macro" -version = "0.1.0" -dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "proc-macro2" version = "0.4.27" @@ -26,6 +16,16 @@ dependencies = [ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustfmt-config_proc_macro" +version = "0.1.0" +dependencies = [ + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "serde" version = "1.0.89" diff --git a/config_proc_macro/Cargo.toml b/config_proc_macro/Cargo.toml index 45f80bf0956..033cc0aaf1f 100644 --- a/config_proc_macro/Cargo.toml +++ b/config_proc_macro/Cargo.toml @@ -1,8 +1,12 @@ [package] -name = "config_proc_macro" +name = "rustfmt-config_proc_macro" version = "0.1.0" authors = ["topecongiro "] edition = "2018" +description = "A collection of procedural macros for rustfmt" +license = "Apache-2.0/MIT" +categories = ["development-tools::procedural-macro-helpers"] +repository = "https://github.com/rust-lang/rustfmt" [lib] proc-macro = true diff --git a/src/config/lists.rs b/src/config/lists.rs index 0270bd0eb0b..11cb17068fb 100644 --- a/src/config/lists.rs +++ b/src/config/lists.rs @@ -1,6 +1,6 @@ //! Configuration options related to rewriting a list. -use config_proc_macro::config_type; +use rustfmt_config_proc_macro::config_type; use crate::config::IndentStyle; diff --git a/src/config/options.rs b/src/config/options.rs index 663c5d4dee2..6b714f6937d 100644 --- a/src/config/options.rs +++ b/src/config/options.rs @@ -3,7 +3,7 @@ use std::fmt; use std::path::{Path, PathBuf}; use atty; -use config_proc_macro::config_type; +use rustfmt_config_proc_macro::config_type; use serde::de::{SeqAccess, Visitor}; use serde::ser::SerializeSeq; use serde::{Deserialize, Deserializer, Serialize, Serializer};