diff --git a/CHANGELOG.md b/CHANGELOG.md index a1e3ba091..e99c9696f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,48 @@ +# 4.2.0 + +Tokei is now more precise, and shouldn't ever panic. +Tokei now handles comments in quotes and more precise nested comments properly. +Fixes #53 + +### Tokei's code count. + +``` +------------------------------------------------------------------------------- + Language Files Lines Code Comments Blanks +------------------------------------------------------------------------------- + Rust 13 2303 1487 594 222 +------------------------------------------------------------------------------- + |ib\language\languages.rs 682 401 198 83 + |anguage\language_type.rs 467 359 96 12 + .\src\main.rs 302 243 17 42 + |lib\language\language.rs 356 166 166 24 + .\src\lib\utils\fs.rs 116 95 9 12 + |\lib\utils\multi_line.rs 156 93 41 22 + .\src\lib\stats.rs 54 36 12 6 + .\src\lib\build.rs 31 23 0 8 + .\src\lib\lib.rs 69 22 43 4 + .\src\lib\utils\macros.rs 27 20 3 4 + .\src\lib\sort.rs 28 19 6 3 + .\src\lib\language\mod.rs 11 6 3 2 + .\src\lib\utils\mod.rs 4 4 0 0 +------------------------------------------------------------------------------- + YAML 2 68 65 3 0 +------------------------------------------------------------------------------- + .\cli.yml 49 46 3 0 + .\.travis.yml 19 19 0 0 +------------------------------------------------------------------------------- + TOML 1 71 58 0 13 +------------------------------------------------------------------------------- + .\Cargo.toml 71 58 0 13 +------------------------------------------------------------------------------- + Autoconf 1 9 7 1 1 +------------------------------------------------------------------------------- + .\src\lib\lib.rs.in 9 7 1 1 +------------------------------------------------------------------------------- + Total 17 2451 1617 598 236 +------------------------------------------------------------------------------- +``` + # 4.1.0 Tokei is now **~40%** faster. diff --git a/Cargo.lock b/Cargo.lock index 0f8a11b46..1ba90e9e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,16 +1,16 @@ [root] name = "tokei" -version = "4.1.0" +version = "4.2.0" dependencies = [ - "clap 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_cbor 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -23,10 +23,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aster" -version = "0.22.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -46,7 +46,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "clap" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ansi_term 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -108,7 +108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num-traits" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -121,22 +121,22 @@ dependencies = [ [[package]] name = "quasi" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_codegen" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -169,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -183,35 +183,35 @@ dependencies = [ [[package]] name = "serde_codegen" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen_internals 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_codegen_internals" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -219,7 +219,7 @@ name = "serde_yaml" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -230,29 +230,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syntex" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syntex_errors" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_pos 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.4.4 (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 = "syntex_pos" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -260,15 +260,15 @@ dependencies = [ [[package]] name = "syntex_syntax" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_pos 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -295,7 +295,7 @@ name = "toml" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]]