Commit graph

142 commits

Author SHA1 Message Date
Aaronepower 08bc17c4dc fixed merge conflict 2016-06-01 22:05:23 +01:00
Aaronepower afaa994ca8 version bump 2.1.2 2016-06-01 15:11:44 +01:00
Aaronepower 461568e53d Updated syntex, and serde_codegen dependencies 2016-06-01 15:10:57 +01:00
Aaronepower 76be54b67d first attempt at moving stuff around 2016-06-01 15:08:36 +01:00
Aaronepower 5ecad644f4 Re ordering the files 2016-05-29 20:31:57 +01:00
Aaron Power fcbf5c7edb Merge pull request #40 from Phlosioneer/fix-tests-patch
Fixed parameter count mismatch.
2016-05-26 19:15:05 +01:00
Phlosioneer 33395b9c56 Fixed parameter count mismatch.
Tests weren't updated to include the correct number of parameters when has_trailing_comments was updated (c5750f9).
nested=true uses the original, pre-change codepath for the tests.
2016-05-26 14:08:22 -04:00
Aaronepower 6cedcb072a Merge branch 'master' of github.com:Aaronepower/tokei 2016-05-24 03:13:04 +01:00
Aaronepower fd191ff273 Added logo. 2016-05-24 03:12:41 +01:00
Aaron Power a4b2404a3f Update README.md 2016-05-23 12:02:07 +01:00
Aaron Power 450d75b03e Update CHANGELOG.md 2016-05-22 23:29:53 +01:00
Aaronepower f65a8c9825 fixes #39 2016-05-22 19:47:17 +01:00
Aaronepower 2b1bfa9f7d version bump 2016-05-22 19:36:03 +01:00
Aaronepower 42a7059202 fixed comments sorting 2016-05-22 19:35:33 +01:00
Aaronepower c5750f9911 fixed tests 2016-05-22 18:43:42 +01:00
Aaronepower dc4d37aa01 removed more wildcards 2016-05-22 18:35:51 +01:00
Aaronepower dc9b27f0b6 fremoved wildcards 2016-05-22 18:31:28 +01:00
Aaronepower 4a891d2c55 Merge branch 'master' of github.com:Aaronepower/tokei 2016-05-22 18:27:24 +01:00
Aaronepower 2e4a39b58a version bump, and added explaintion of file_input 2016-05-22 18:26:54 +01:00
Aaron Power 5f66c64a3d Update CHANGELOG.md 2016-05-22 18:21:07 +01:00
Aaron Power a3815840b0 Update CHANGELOG.md 2016-05-22 18:15:22 +01:00
Aaron Power 8112cbb0d4 Update CHANGELOG.md 2016-05-22 18:14:57 +01:00
Aaron Power 350cb5f30f 2.1.0 IO 2016-05-22 18:07:16 +01:00
Aaronepower bc83358d82 ICE error 2016-05-20 12:44:24 +01:00
Aaronepower 77c52b4aea fixed miscounting total files 2016-05-17 11:27:03 +01:00
Aaronepower a126328d2e Merge branch 'master' into io 2016-05-17 11:24:47 +01:00
Aaronepower ee14e7ed5c resolved conflict 2016-05-17 11:24:31 +01:00
Aaronepower ff5db0626d change language.total, to something more descriptive 2016-05-17 11:23:44 +01:00
Aaron Power 5fa350e988 Merge pull request #35 from liigo/master
Prints code lines before comments and blanks
2016-05-17 11:18:56 +01:00
Aaronepower 43ea4d4256 reformatted cli.yml, and added additional constructor 2016-05-17 11:15:51 +01:00
Liigo 315f0882d1 Prints code lines before comments and blanks 2016-05-17 15:26:50 +08:00
Aaron Power a6de3bbd78 Update README.md 2016-05-16 18:25:38 +01:00
Aaron Power 39e771fdcb Update README.md 2016-05-15 21:32:48 +01:00
Aaron Power 8bc035605a Merge pull request #34 from llogiq/clippy
another two clippy warnings fixed
2016-05-15 14:10:25 +01:00
Andre Bogus 945ec91484 another two clippy warnings 2016-05-15 13:36:44 +02:00
Aaronepower a4ae97f6b2 updated cargo.lock 2016-05-13 22:25:19 +01:00
Aaronepower cccc460c8e updated dependencies 2016-05-13 22:22:37 +01:00
Aaronepower f9652fd1f2 Merge branch 'master' of github.com:Aaronepower/tokei 2016-05-13 22:19:43 +01:00
Aaronepower 8c6b6f28b2 forgot file 2016-05-13 22:16:20 +01:00
Aaronepower 0287ab0946 version 2.0 2016-05-13 22:16:05 +01:00
Aaronepower ebee004a8f moved functions to fsutil, and switched from RefCell to an Enum based system 2016-05-12 15:58:03 +01:00
Aaron Power 9aae5431e7 Update README.md 2016-05-02 09:54:39 +01:00
Aaronepower db2060e0f2 fixed unused import 2016-05-01 18:36:37 +01:00
Aaronepower c28bfa8e9e implemented file counting. 2016-05-01 18:33:46 +01:00
Aaronepower e0fa667f8f Merge branch 'master' of github.com:Aaronepower/tokei 2016-03-29 14:39:03 +01:00
Aaronepower 2a97d41c20 Added .markdown, reduced runtime borrows, fixed 25 2016-03-29 14:38:58 +01:00
Aaron Power fe1cb5dc24 Merge pull request #26 from hhatto/support-more-language
Support more language
2016-03-29 14:37:31 +01:00
Hideo Hattori e827aaf15a support .zsh 2016-03-29 12:19:22 +09:00
Hideo Hattori 4f88d5dabf Merge branch 'master' into support-more-language 2016-03-29 11:55:11 +09:00
Hideo Hattori 2aefa97a3c support protocol buffers file 2016-03-29 11:54:53 +09:00