From e94bd34a06d878a41bb8be409f173a8824dda63f Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Tue, 8 Dec 2015 16:19:23 +1300 Subject: [PATCH] cargo upgrade, bug fix, and prepare for packaging --- Cargo.lock | 43 +++++++++++++++++++------------------------ Cargo.toml | 9 ++++----- src/visitor.rs | 3 ++- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87e4c64ce2c..ea9f07ad1ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,23 +1,23 @@ [root] name = "rustfmt" -version = "0.0.1" +version = "0.0.2" dependencies = [ "diff 0.1.7 (git+https://github.com/utkarshkukreti/diff.rs.git)", "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "strings 0.0.1 (git+https://github.com/nrc/strings.rs.git)", - "syntex_syntax 0.22.0 (git+https://github.com/serde-rs/syntex)", - "term 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.23.0 (git+https://github.com/serde-rs/syntex)", + "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "aho-corasick" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "memchr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -31,15 +31,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "diff" version = "0.1.7" -source = "git+https://github.com/utkarshkukreti/diff.rs.git#6edb9454bf4127087aced0fe07ab3ea6894083cb" +source = "git+https://github.com/utkarshkukreti/diff.rs.git#05c701a379f7eaa9b386af79f0a17b87d814f9bd" [[package]] name = "env_logger" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -56,11 +56,6 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "libc" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "libc" version = "0.2.2" @@ -68,10 +63,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "log" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -84,10 +79,10 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -107,25 +102,25 @@ name = "strings" version = "0.0.1" source = "git+https://github.com/nrc/strings.rs.git#d33d75a7c22522c76f2306b16b238e363de45af4" dependencies = [ - "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syntex_syntax" -version = "0.22.0" -source = "git+https://github.com/serde-rs/syntex#7913a15053ef5f2526aeff8b318f49d010582efd" +version = "0.23.0" +source = "git+https://github.com/serde-rs/syntex#f1e67d25ae320d6c7707bf0aef1ac072f63cf9c4" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "term" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index ebd4e8e7f1e..4a976cbe997 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "rustfmt" -version = "0.0.1" -authors = ["Nicholas Cameron "] +version = "0.0.2" +authors = ["Nicholas Cameron ", "Marcus Klaas ", "The Rustfmt contributors"] description = "Tool to find and fix Rust formatting issues" -repository = "https://github.com/nick29581/rustfmt" +repository = "https://github.com/rust-lang-nursery/rustfmt" readme = "README.md" license = "Apache-2.0/MIT" +include = ["src/*.rs", "Cargo.toml"] [dependencies] toml = "0.1.20" @@ -20,5 +21,3 @@ syntex_syntax = { git = "https://github.com/serde-rs/syntex" } log = "0.3.2" env_logger = "0.3.1" getopts = "0.2" - -[dev-dependencies] diff --git a/src/visitor.rs b/src/visitor.rs index 012760ec9fb..8a0e1c9b847 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -55,7 +55,7 @@ impl<'a> FmtVisitor<'a> { self.push_rewrite(stmt.span, rewrite); } - ast::Stmt_::StmtMac(ref mac, _macro_style) => { + ast::Stmt_::StmtMac(ref mac, _macro_style, _) => { self.format_missing_with_indent(stmt.span.lo); self.visit_mac(mac); } @@ -360,6 +360,7 @@ impl<'a> FmtVisitor<'a> { // FIXME: Implement } ast::ImplItemKind::Macro(ref mac) => { + self.format_missing_with_indent(ii.span.lo); self.visit_mac(mac); } }