Auto merge of #21 - kbknapp:v0.2.1, r=kbknapp

V0.2.1
kbknapp · Dec 24, 2015 · 1840551 · 1840551
2 parents 4755363 + bc4c84a
commit 1840551
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+<a name="v0.2.1"></a>
+### v0.2.1 (2015-12-24)
+
+
+#### Improvements
+
+*   adds C, h++, cc, cxx, cp, and htm extensions ([ea4f540a](https://github.com/kbknapp/cargo-count/commit/ea4f540ac356dc946c42aaebe683f8c6d70fd362), closes [#19](https://github.com/kbknapp/cargo-count/issues/19))
+
+
+<a name="v0.2.0"></a>
+## v0.2.0 (2015-12-24)
+
+
+#### Improvements
+
+*   Ignore files in accordance with .gitignore ([a0c30706](https://github.com/kbknapp/cargo-count/commit/a0c307061413972b973f148802abe06e80a01099), Closes [#8](https://github.com/kbknapp/cargo-count/issues/8), [#9](https://github.com/kbknapp/cargo-count/issues/9))
+
+#### Bug Fixes
+
+*   fixes building on windows due to upstream dep ([3333f252](https://github.com/kbknapp/cargo-count/commit/3333f252f4c7e5e1324d5a178b9f020823283bc7))
+
+
+
 <a name="v0.1.4"></a>
 ### v0.1.4 (2015-11-14)
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-count"
-version = "0.1.5"
+version = "0.2.1"
 authors = ["Kevin K <kbknapp@gmail.com>"]
 exclude = ["*.png"]
 description = "Cargo subcommand for displaying statistics about projects, such as code, comments, and unsafe counters"

diff --git a/src/language.rs b/src/language.rs
@@ -26,7 +26,13 @@ impl Language {
     pub fn from_ext(ext: &str) -> Option<Language> {
         match ext {
             "cpp" => Some(Language::Cpp),
+            "cp" => Some(Language::Cpp),
+            "cc" => Some(Language::Cpp),
+            "cxx" => Some(Language::Cpp),
+            "c++" => Some(Language::Cpp),
+            "C" => Some(Language::Cpp),
             "hpp" => Some(Language::Hpp),
+            "h++" => Some(Language::Hpp),
             "c" => Some(Language::C),
             "h" => Some(Language::Header),
             "css" => Some(Language::Css),
@@ -35,6 +41,7 @@ impl Language {
             "rs" => Some(Language::Rust),
             "xml" => Some(Language::Xml),
             "html" => Some(Language::Html),
+            "htm" => Some(Language::Html),
             "py" => Some(Language::Python),
             "rb" => Some(Language::Ruby),
             "php" => Some(Language::Php),