commit_hash
stringlengths
40
40
author
stringlengths
1
57
date
timestamp[s]date
2010-07-26 04:45:09
2026-04-14 18:21:10
message
stringlengths
8
1.39M
diff
stringlengths
68
51.2k
files_changed
int64
1
136
insertions
int64
0
2.35k
deletions
int64
0
1.9k
177681de8e3755284c9ebc200af8a6c54514c71b
Michael-F-Bryan
2021-12-06T08:49:33
Moved Metadata-related File methods into the "file.rs" file
diff --git a/include_dir/src/file.rs b/include_dir/src/file.rs index a8f98ec..3ccfc93 100644 --- a/include_dir/src/file.rs +++ b/include_dir/src/file.rs @@ -1,6 +1,3 @@ -#[cfg(feature = "metadata")] -use std::time::{Duration, SystemTime}; - use std::{ fmt::{self, Debug, Formatter}, path::Path, @@ -43,6 +40,2...
2
19
24
e0fbf0bbbb0c37b7476b5f40a9dd93d12a689402
Michael-F-Bryan
2021-12-06T08:38:11
Removed all explicit #[doc(cfg(...))] attributes
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index 8916f77..b9380b9 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -95,11 +95,9 @@ mod dir_entry; mod file; #[cfg(feature = "metadata")] -#[doc(cfg(feature = "metadata"))] mod metadata; #[cfg(feature = "glob")] -#[doc(cfg(featu...
1
0
3
d58b29639eccd578315cf804e6ba408d5a10ee80
Michael-F-Bryan
2021-11-19T04:16:05
(cargo-release) version 0.7.1
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 08415af..f855123 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.7.0" +version = "0.7.1" description = "Embed the con...
1
1
1
879e476f2fc4925855aa095335279b8803c064f6
Michael-F-Bryan
2021-11-19T04:16:05
(cargo-release) version 0.7.1
diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 9af3689..c23dffc 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "include_dir_macros" -version = "0.7.0" +version = "0.7.1" description = "The procedural macro used by include_dir" authors = ["Michael Bryan <michaelfbry...
1
1
1
bab2c97f95289a77569997826f87f8d1b04e01ff
Jannik Obermann
2021-11-18T15:05:42
Fix is string test Use starts_with + ends_with
diff --git a/macros/src/lib.rs b/macros/src/lib.rs index c72e238..1b36839 100644 --- a/macros/src/lib.rs +++ b/macros/src/lib.rs @@ -30,7 +30,7 @@ pub fn include_dir(input: TokenStream) -> TokenStream { fn unwrap_string_literal(lit: &proc_macro::Literal) -> String { let mut repr = lit.to_string(); - if !repr...
1
1
1
c499012518779458470c649fae460eb45675cc40
Michael-F-Bryan
2021-11-14T15:55:18
(cargo-release) version 0.7.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 24d2307..297cccd 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.3-dev" +version = "0.7.0" description = "Embed the...
1
1
1
8be828180d7dbb5854c8f791c414bf61e4215eac
Michael-F-Bryan
2021-11-14T15:55:18
(cargo-release) version 0.7.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index d592538..24d2307 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -13,7 +13,7 @@ rust-version = "1.56" [dependencies] glob = { version = "0.3", optional = true } -include_dir_macros = { version = "0.6.3-dev", path = "../macros" } ...
2
2
2
8c4a4b90da06d65f2abe1762c7eb08852cf99d85
Michael-F-Bryan
2021-11-14T15:27:41
Moved things around to provide better doc_cfg docs
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 56e2928..d592538 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -11,18 +11,6 @@ categories = ["development-tools", "web-programming", "game-engines"] edition = "2021" rust-version = "1.56" -[package.metadata.docs.rs] -all-featur...
7
100
95
0e745c3686e8556e5cb3c17cfb9f8bf53539bf08
Michael-F-Bryan
2021-11-04T07:57:06
Added a note on performance
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index d611c15..b9a92aa 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -58,6 +58,24 @@ //! better caching. Functionality behind this feature flag is unstable and //! may change at any time. //! +//! # Compile Time Considerations +//...
1
18
0
b0e3174766f4050b9648600c2532ac1484411287
Michael-F-Bryan
2021-11-04T07:24:29
Attach timestamp metadata to files
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 9be03f2..56e2928 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -33,3 +33,4 @@ tempdir = "0.3" [features] default = [] nightly = ["include_dir_macros/nightly"] +metadata = ["include_dir_macros/metadata"] diff --git a/include_dir/...
5
130
16
3b1fbbbb5799e88b92a106dfc593f923ba6ddf57
Michael-F-Bryan
2021-11-04T06:22:01
documentation and public API tweaks
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 23373c8..6122aec 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.3-alpha.0" +version = "0.6.3-dev" description = "E...
6
28
14
8ebdbfcdc32213cb50f60854ff9b97a44ea4d72f
Michael-F-Bryan
2021-11-04T04:48:53
Cleaned up a lot of the docs and globbing code
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index aafdd66..23373c8 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -28,3 +28,7 @@ include_dir_macros = { version = "0.1.0", path = "../macros" } [dev-dependencies] tempdir = "0.3" + +[features] +default = [] +nightly = ["include_di...
6
82
65
3e365328d4e506f17e698cfc25738f44d7e94106
Michael-F-Bryan
2021-11-03T16:20:01
Wired the new macro up to the main crate
diff --git a/Cargo.toml b/Cargo.toml index 5b0a74f..b2b10a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["include_dir", "include_dir_impl", "macros"] +members = ["include_dir", "macros"] diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 2dfe08e..aafdd66 100644 --- a...
13
126
285
5743425c9286ec2a4301be488e2ef2c1800f8dcd
Michael-F-Bryan
2021-11-03T15:00:22
Implemented expansion
diff --git a/macros/Cargo.toml b/macros/Cargo.toml index a674ab1..0c0907c 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -9,3 +9,5 @@ edition = "2021" proc-macro = true [dependencies] +proc-macro2 = "1.0.32" +quote = "1.0.10" diff --git a/macros/src/lib.rs b/macros/src/lib.rs index 9856332..0aa297a 10064...
2
88
6
6cbc9cde21308927ed388c17d388418fed1c10dd
Michael-F-Bryan
2021-11-03T13:58:59
Created a new proc macro crate and implemented path resolution
diff --git a/Cargo.toml b/Cargo.toml index 16e40d6..5b0a74f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["include_dir", "include_dir_impl"] \ No newline at end of file +members = ["include_dir", "include_dir_impl", "macros"] diff --git a/macros/Cargo.toml b/macros/Cargo.toml new fil...
3
217
1
a8f67275d5eb28b4e2fa54a03875062cb10805dc
Michael-F-Bryan
2021-09-02T13:37:23
(cargo-release) start next development iteration 0.6.3-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 3be91ce..2dfe08e 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.2" +version = "0.6.3-alpha.0" description = "Embed...
1
1
1
e8221cd07efbdc4351b1120ac31177c575a59744
Michael-F-Bryan
2021-09-02T13:37:23
(cargo-release) start next development iteration 0.6.3-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 2920cfa..3be91ce 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = { ve...
2
2
2
9fb457c1ca618a90b6e6f571c45389af9cdfada5
Michael-F-Bryan
2021-09-02T13:36:42
(cargo-release) version 0.6.2
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index b8d154b..2920cfa 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.2-alpha.0" +version = "0.6.2" description = "Embed...
1
1
1
151b2626092f795a4ee2bc63c7414f763d081e96
Michael-F-Bryan
2021-09-02T13:36:42
(cargo-release) version 0.6.2
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 4fb4491..b8d154b 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = { ve...
2
2
2
70855ece660fa75d890e383a06384b275adb9672
arctic_hen7
2021-09-02T06:36:19
test: ✅ updated tests to catch recursion failures in future
diff --git a/include_dir/tests/integration_test.rs b/include_dir/tests/integration_test.rs index f916d0f..7aa6597 100644 --- a/include_dir/tests/integration_test.rs +++ b/include_dir/tests/integration_test.rs @@ -9,7 +9,7 @@ fn included_all_files() { let root = Path::new(env!("CARGO_MANIFEST_DIR")); println!(...
1
21
5
e2deb060927d3349baeb95c53c310275eb897b7d
arctic_hen7
2021-09-01T21:32:54
fix: 🐛 fixed recursive extraction
diff --git a/include_dir/src/dir.rs b/include_dir/src/dir.rs index 5981dc3..4ce175b 100644 --- a/include_dir/src/dir.rs +++ b/include_dir/src/dir.rs @@ -80,27 +80,29 @@ impl<'a> Dir<'a> { /// Fails if some files already exist. /// In case of error, partially extracted directory may remain on the filesystem. ...
2
21
18
8a9b0908d8d5dc8d985a4a699a1fd458f4818c38
Michael-F-Bryan
2021-06-30T17:52:05
(cargo-release) start next development iteration 0.6.2-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 8a7352e..4fb4491 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.1" +version = "0.6.2-alpha.0" description = "Embed...
1
1
1
04be162aa62b6e5716e15a662b053ef6680cf5ce
Michael-F-Bryan
2021-06-30T17:52:05
(cargo-release) start next development iteration 0.6.2-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 8856ed0..8a7352e 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = { ve...
2
2
2
1c1994d1e27c7e2446efebe85ff559d799728408
Michael-F-Bryan
2021-06-30T17:51:13
(cargo-release) version 0.6.1
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 42ad3e1..8856ed0 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.1-alpha.0" +version = "0.6.1" description = "Embed...
1
1
1
5e4cd5bfef596aaf9b8595dc5b108e8cd1227508
Michael-F-Bryan
2021-06-30T17:51:12
(cargo-release) version 0.6.1
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index d555176..42ad3e1 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = { ve...
2
2
2
87f172efb7400ba5d58e6291ff419c5b5f6871db
Michael-F-Bryan
2021-06-30T17:49:25
Use path dependencies when developing and crates.io for production
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index d41763e..d555176 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = "=0....
1
1
1
b5df573a70ae800a770489e99c1f5923124dcee3
Viktor Sonesten
2021-04-20T15:58:02
Dir: add extract-to-filesystem functionality Resolves #41.
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 115a300..d41763e 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -27,6 +27,9 @@ glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" include_dir_impl = "=0.6.0" +[dev-dependencies] +tempdir = "0.3" + [features] d...
3
52
0
df452a29de55e2aa8b989117d29f94469902e257
Michael-F-Bryan
2020-05-05T02:34:17
(cargo-release) start next development iteration 0.6.1-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index cf2ac45..115a300 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.6.0" +version = "0.6.1-alpha.0" description = "Embed...
1
1
1
9375c9c781273b32fe093bdfd089983975465952
Michael-F-Bryan
2020-05-05T02:34:02
(cargo-release) version 0.6.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index e888fbe..cf2ac45 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.5.1-alpha.0" +version = "0.6.0" description = "Embed...
1
1
1
58f65d3cb0dacb0c2ec8e06dbdfdab3dfbd38585
Michael-F-Bryan
2020-05-05T02:33:46
Played around with version numbers
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 518db1e..e888fbe 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = { pa...
2
2
2
643793d9ee7ad9407f4a9edec546d3a442129903
Michael-F-Bryan
2020-05-05T02:31:01
(cargo-release) version 0.6.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index a353781..518db1e 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,7 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = { version = "0.3", optional = true } proc-macro-hack = "0.5" -include_dir_impl = { pa...
2
2
2
2a51120c8b4dbb62ca1822bd243799f2d19d51eb
nytopop
2020-03-16T06:53:16
Relax returned lifetimes of get_dir and get_file Prior to this change, the elided lifetime '_ would be constrained to at most the lifetime of the &self reference _or_ the internal lifetime 'a, when instead it could just be 'a. If &self isn't actually behind a static, but 'a: 'static, the old behavior leads to some ra...
diff --git a/include_dir/src/dir.rs b/include_dir/src/dir.rs index db7c642..37cde8e 100644 --- a/include_dir/src/dir.rs +++ b/include_dir/src/dir.rs @@ -37,7 +37,7 @@ impl<'a> Dir<'a> { /// Fetch a sub-directory by *exactly* matching its path relative to the /// directory included with `include_dir!()`. - ...
1
2
2
ae4653e80b1fce7f7aa1d12a8532940ae48917c0
Samani G. Gikandi
2020-01-28T16:01:56
Updates to include_dir to pass new lints https://travis-ci.org/Michael-F-Bryan/include_dir/jobs/642951526#L289
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index 3eea072..9578fb1 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -69,4 +69,4 @@ pub use include_dir_impl::include_dir; /// Example the output generated when running `include_dir!()` on itself. #[cfg(feature = "example-output")] -...
1
1
1
c1ad2e8bba76d6c4d7eff5c7c24cad8dc293dbd1
Samani G. Gikandi
2020-01-27T16:41:33
Enables new lints for `include_dir` * rust-2018-idioms * elided-lifetime-in-path * future_incompatible See https://doc.rust-lang.org/rustc/lints/index.html for the full list of lints and descriptions of what they do.
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index bba9226..0765320 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -35,9 +35,12 @@ //! - **example:** compile in an example of the embedded directory tree #![deny( - missing_docs, + elided_lifetimes_in_paths, + future_inco...
1
5
2
aae2f9a5a02a472f37dd3ae76c9e61aff78a0056
Johan Andersson
2020-01-25T11:02:52
Switch from failure to anyhow for error handling Anyhow works similar but has fewer dependencies, is more maintained, and is compatible with std Error.
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index f3fee35..45d12e9 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -21,7 +21,7 @@ repository = "Michael-F-Bryan/include_dir" proc-macro-hack = "0.5" syn = "1" quote = "1" -failure = "0.1" +anyhow = "1.0" proc-ma...
4
4
5
92e6b8f4b3fd3eee758d556be45d06427a93be6a
Samani G. Gikandi
2020-01-23T22:02:06
Fixes cargo fix and cleans whitespace with rustfmt cargo fix removed `extern crate proc_macro` despite this being a [well known exception](https://doc.rust-lang.org/edition-guide/rust-2018/module-system/path-clarity.html?highlight=extern,crate#an-exception) to the 2018 syntax.
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index f7f0b08..bba9226 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -46,7 +46,6 @@ extern crate include_dir_impl; #[macro_use] extern crate proc_macro_hack; - mod dir; mod file; mod globs; diff --git a/include_dir_impl/src/lib.rs...
2
1
7
254348857c2fa5ec42b257c34424567afe8c179d
Samani G. Gikandi
2020-01-23T21:59:40
Updates include_dir_impl dependency to use path We now use the in-repo path and manually specify the pre-release version.
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 0b23a16..d15e3d2 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -25,10 +25,7 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = "0.3" proc-macro-hack = "0.5" - -[dependencies.include_dir_impl] -#path = "../includ...
1
1
4
6b5fd0b9b40b2fd77849ce6481b344121e574e2e
Samani G. Gikandi
2020-01-23T21:39:52
Updates codebase to use Rust 2018 idioms This commit simply runs `cargo fix --edition-idioms` across the codebase. There are no hand-edited changes included here.
diff --git a/include_dir/src/dir.rs b/include_dir/src/dir.rs index 7530abe..61c228a 100644 --- a/include_dir/src/dir.rs +++ b/include_dir/src/dir.rs @@ -39,7 +39,7 @@ impl<'a> Dir<'a> { /// Fetch a sub-directory by *exactly* matching its path relative to the /// directory included with `include_dir!()`. - ...
5
12
12
d139bdc3a3d97c65a588e2f1714fefe9dec8a269
Michael Bryan
2020-01-13T16:04:33
(cargo-release) start next development iteration 0.5.1-alpha.0
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index a4bb47a..f3fee35 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir_impl" -version = "0.5.0" +version = "0.5.1-alpha...
1
1
1
1f459e57d962cb47f2b511e05dbee2fb52ca0986
Michael Bryan
2020-01-13T16:04:33
(cargo-release) start next development iteration 0.5.1-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index ac43a3a..0b23a16 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.5.0" +version = "0.5.1-alpha.0" description = "Embed...
1
1
1
2c74317466e7fcf1ee3924509978ce85858692e7
Michael Bryan
2020-01-13T15:59:12
(cargo-release) version 0.5.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 903db56..ac43a3a 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -28,7 +28,7 @@ proc-macro-hack = "0.5" [dependencies.include_dir_impl] #path = "../include_dir_impl" -version = "0.4.1" +version = "^0.5.0" [features] default =...
2
2
2
b3d9707861df8d072c00a5183d9a18220fb5da9a
Michael Bryan
2020-01-13T15:59:08
(cargo-release) version 0.5.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 10a6a8e..903db56 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.4.2-alpha.0" +version = "0.5.0" description = "Embed...
1
1
1
44550760bcc50e3b5827cfa0ba44fded03bb3ead
Michael Daffin
2020-01-09T08:50:11
Export DirEntry so it can be used in pattern matching downstream
diff --git a/include_dir/src/globs.rs b/include_dir/src/globs.rs index 3fc789e..abaf4a9 100644 --- a/include_dir/src/globs.rs +++ b/include_dir/src/globs.rs @@ -38,13 +38,17 @@ impl<'a> Iterator for Globs<'a> { } } +/// Entries returned by the Globs iterator #[derive(Debug, Copy, Clone, PartialEq)] pub enum D...
2
5
0
a631dd55c011d2bade59eadd69de8a9140628e76
Michael Bryan
2020-01-11T09:22:03
Migrated to the 2018 edition
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 16070ed..10a6a8e 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -8,6 +8,7 @@ readme = "../README.md" keywords = ["assets", "include", "embed", "dir"] repository = "https://github.com/Michael-F-Bryan/include_dir" categories = ["de...
6
7
5
84b81e0f890644820a5ed3b7307bd9b648fd5906
Michael Bryan
2019-11-05T11:21:15
(cargo-release) start next development iteration 0.4.2-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 4fdee86..16070ed 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.4.1" +version = "0.4.2-alpha.0" description = "Embed...
1
1
1
15782b67c446e11d51370ab15458891b14314d8d
Michael Bryan
2019-11-05T11:20:57
(cargo-release) version 0.4.1
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 011d58c..4fdee86 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.4.1-alpha.0" +version = "0.4.1" description = "Embed...
1
1
1
d3165aa2452c02a29138427c0ad5f5f1d0601004
Michael Bryan
2019-11-05T11:20:10
Temporarily switched from path dependencies to the published version
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 7be7a4d..011d58c 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -26,7 +26,8 @@ glob = "0.3" proc-macro-hack = "0.5" [dependencies.include_dir_impl] -path = "../include_dir_impl" +#path = "../include_dir_impl" +version = "0.4.1" ...
1
2
1
68b228cc384ddb4ab2fdc1c36b3ebacc629bf968
Michael Bryan
2019-11-05T10:15:13
(cargo-release) start next development iteration 0.4.2-alpha.0
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index 3323f8c..a265a05 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir_impl" -version = "0.4.1" +version = "0.4.2-alpha...
1
1
1
863b903fa3b3da9e251efa0d3cc1ecf1814c6f38
Michael Bryan
2019-11-05T10:14:49
(cargo-release) version 0.4.1
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index b78af48..3323f8c 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir_impl" -version = "0.4.1-alpha.0" +version = "0.4...
1
1
1
bbe07711f356bfa43b92dac69f96500eb28494cd
Michael Bryan
2019-11-04T15:08:42
Revert "Converted include_dir_impl into a shim containing the proc macro's business logic" This reverts commit 906c9b04fa02ea8f7070f5faf20216aac485a4c9.
diff --git a/include_dir/src/dir.rs b/include_dir/src/dir.rs index 46b3a25..47884ff 100644 --- a/include_dir/src/dir.rs +++ b/include_dir/src/dir.rs @@ -1,6 +1,6 @@ -use file::File; +use crate::file::File; use glob::{Pattern, PatternError}; -use globs::{DirEntry, Globs}; +use crate::globs::{DirEntry, Globs}; use std:...
6
24
14
906c9b04fa02ea8f7070f5faf20216aac485a4c9
Michael Bryan
2019-11-04T14:45:30
Converted include_dir_impl into a shim containing the proc macro's business logic
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index b78af48..863e46a 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -6,6 +6,7 @@ description = "Implementation crate for include_dir" license = "MIT" readme = "../README.md" repository = "https://github.com/Michae...
3
6
19
5f90eb184dcc9fdd2d5a46c7fa4a7efd65793279
Michael Bryan
2019-11-04T14:29:03
Switch back to using path dependencies
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 6882d9d..7be7a4d 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -26,7 +26,7 @@ glob = "0.3" proc-macro-hack = "0.5" [dependencies.include_dir_impl] -version = "0.4.0" +path = "../include_dir_impl" [features] default = []
1
1
1
1d23628cd609d3cee428a52cdfcf287e33df81d7
Michael Bryan
2019-11-04T14:27:53
(cargo-release) start next development iteration 0.4.1-alpha.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 5ec3493..6882d9d 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.4.0" +version = "0.4.1-alpha.0" description = "Embed...
1
1
1
afc0b5312bef979d536fdea68229053616b9c064
Michael Bryan
2019-11-04T14:26:45
Use the `include_dir_impl` crate from crates.io
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 55cee9a..5ec3493 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -26,7 +26,7 @@ glob = "0.3" proc-macro-hack = "0.5" [dependencies.include_dir_impl] -path = "../include_dir_impl" +version = "0.4.0" [features] default = []
1
1
1
d9d1d035b3dab772d50eab92efd0ef0e76ff58c7
Michael Bryan
2019-11-04T14:20:24
(cargo-release) version 0.4.0
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 45a30c0..55cee9a 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.3.0" +version = "0.4.0" description = "Embed the con...
1
4
4
44f6e4ebd4985c9319d2bd0dff024d2a5f703413
Michael Bryan
2019-11-04T14:20:09
(cargo-release) start next development iteration 0.4.1-alpha.0
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index 6030db8..b78af48 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir_impl" -version = "0.4.0" +version = "0.4.1-alpha...
1
1
1
72b9855e5bdde83423b881f5078f57ec6abfdf99
Michael Bryan
2019-11-04T14:19:24
(cargo-release) version 0.4.0
diff --git a/include_dir_impl/Cargo.toml b/include_dir_impl/Cargo.toml index 222da42..6030db8 100644 --- a/include_dir_impl/Cargo.toml +++ b/include_dir_impl/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir_impl" -version = "0.3.0" +version = "0.4.0" des...
1
1
1
83d05ffbe28679c3a08cbeec0a176b7cc1067283
Michael Bryan
2019-11-04T14:18:58
Ran clippy and rustfmt
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index a9a64c9..45a30c0 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.2.2" +version = "0.3.0" description = "Embed the con...
6
26
16
c7441e9b38e49955b85237d97adaae7a63a91a39
Michael Bryan
2019-11-04T14:09:26
Bumped dependency versions
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index e2bde78..a9a64c9 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -19,7 +19,7 @@ branch = "master" repository = "Michael-F-Bryan/include_dir" [dependencies] -glob = "0.2.11" +glob = "0.3" proc-macro-hack = "0.5" [dependencies....
2
5
5
9ef34e659f5f83f936badeab25f804d3d46c79c8
Erick Tryzelaar
2019-03-02T07:27:46
this is also an extension to include_bytes!()
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index d1b2d54..007ba06 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -1,5 +1,5 @@ -//! An extension to the `include_str!()` macro for embedding an entire directory -//! tree into your binary. +//! An extension to the `include_str!()` and...
1
2
2
cfd52704cd4116248467fc8e52f7fc7e57447a12
Erick Tryzelaar
2019-03-02T07:27:30
These don't need to be public
diff --git a/include_dir_impl/src/dir.rs b/include_dir_impl/src/dir.rs index 7f2d604..c96239d 100644 --- a/include_dir_impl/src/dir.rs +++ b/include_dir_impl/src/dir.rs @@ -5,11 +5,11 @@ use quote::{ToTokens, quote}; use std::path::{Path, PathBuf}; #[derive(Debug, Clone, PartialEq)] -pub struct Dir { - pub root_...
2
8
8
c56274f50d2e842985d15718fa3e0fd5a724885f
Erick Tryzelaar
2019-03-02T07:24:12
Update to proc-macro-hack 0.5
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index e4f30c4..2539ba9 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -20,10 +20,9 @@ repository = "Michael-F-Bryan/include_dir" [dependencies] glob = "0.2.11" -proc-macro-hack = "0.4" +proc-macro-hack = "0.5" [dependencies.include...
6
29
46
2deb90173fd977119a9b292823ba643cc20f198d
Michael Lamparski
2018-09-01T15:52:25
use include_bytes! for less memory overhead This uses `include_bytes!` to generate the bytestring rather than the `quote!` macro. With this change, the total memory used by rustc for a crate that includes a 15 MB file drops from over 8 GB to only about 700 MB. This is similar to #23, but that predated the proc_macro...
diff --git a/include_dir_impl/src/dir.rs b/include_dir_impl/src/dir.rs index da0be81..2a7ebcf 100644 --- a/include_dir_impl/src/dir.rs +++ b/include_dir_impl/src/dir.rs @@ -6,57 +6,49 @@ use std::path::{Path, PathBuf}; #[derive(Debug, Clone, PartialEq)] pub struct Dir { - pub path: PathBuf, + pub root_rel_pat...
3
27
47
807b7106370de23821e1b1c011166152692bed7e
Michael Bryan
2018-06-06T15:12:35
Bumped the version numbers
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 4a69d1f..3a0bb6a 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" -version = "0.2.0" +version = "0.2.1" description = "Embed the con...
2
3
3
3cdde43ed47fbc65b71fa8d9b4984442ddc401d5
Michael Bryan
2018-06-06T15:09:52
Added docs
diff --git a/include_dir/src/dir.rs b/include_dir/src/dir.rs index 52c6a36..21d5118 100644 --- a/include_dir/src/dir.rs +++ b/include_dir/src/dir.rs @@ -15,24 +15,30 @@ pub struct Dir<'a> { } impl<'a> Dir<'a> { + /// Get the directory's path. pub fn path(&self) -> &'a Path { Path::new(self.path) ...
4
20
1
77b764949bfb183d4fd9cf1b0952fa0332b02837
Michael Bryan
2018-06-06T14:24:57
Updated include_dir to pull the impl crate from crates.io
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 597f917..4a69d1f 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -23,7 +23,8 @@ glob = "0.2.11" proc-macro-hack = "0.4" [dependencies.include_dir_impl] -path = "../include_dir_impl" +version = "0.2.0" +#path = "../include_dir_imp...
1
2
1
3b23685a56b461993e052551e95e40ac7315b60c
Michael Bryan
2018-06-06T14:20:23
Updated crate metadata
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 58dc160..597f917 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -4,16 +4,11 @@ name = "include_dir" version = "0.2.0" description = "Embed the contents of a directory in your binary" license = "MIT" -readme = "README.md" +readme ...
2
15
9
ace95bb557d75c9f2bbb3ab70127047d1fd93c9a
Michael Bryan
2018-06-06T13:42:18
Added a "features" section
diff --git a/include_dir/src/lib.rs b/include_dir/src/lib.rs index 42ecaad..8ce1c81 100644 --- a/include_dir/src/lib.rs +++ b/include_dir/src/lib.rs @@ -1,7 +1,6 @@ //! An extension to the `include_str!()` macro for embedding an entire directory //! tree into your binary. //! -//! //! # Examples //! //! The `incl...
1
8
1
312dbb39c65800b4e4bb02a0bb96ced5a4af74fd
Michael Bryan
2018-06-06T12:56:42
Added globs
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 01c3951..560ab2d 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -1,8 +1,10 @@ [package] +authors = ["Michael Bryan <michaelfbryan@gmail.com>"] name = "include_dir" version = "0.1.0" -authors = ["Michael Bryan <michaelfbryan@gmail...
5
154
12
205724c0a85dee51bc1a60a67ea52b00ec08be2e
Michael Bryan
2018-05-31T23:35:45
Started over
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index b54a054..01c3951 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -5,5 +5,4 @@ authors = ["Michael Bryan <michaelfbryan@gmail.com>"] [dependencies] include_dir_impl = { path = "../include_dir_impl" } -include_dir_core = { path = "...
14
186
112
bf6a4d88f7be06cae08f41d96cccb7d0ca1416f9
Michael Bryan
2018-05-30T15:29:21
Actually added the include_dir_core crate
diff --git a/include_dir_core/Cargo.toml b/include_dir_core/Cargo.toml new file mode 100644 index 0000000..f57a418 --- /dev/null +++ b/include_dir_core/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "include_dir_core" +version = "0.1.0" +authors = ["Michael Bryan <michaelfbryan@gmail.com>"] + +[dependencies] +failure = ...
4
102
0
9932a397e7eb31a658db7df792526a027e292a74
Michael Bryan
2018-05-30T15:13:14
Pulled the core data types into an include_dir_core crate
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index d582720..b54a054 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -5,7 +5,5 @@ authors = ["Michael Bryan <michaelfbryan@gmail.com>"] [dependencies] include_dir_impl = { path = "../include_dir_impl" } +include_dir_core = { path = "...
6
32
94
e208231a912d8f6c43fa01ca6b613c13ce97409b
Michael Bryan
2018-05-30T14:54:25
Started working on the crate
diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml index 4df1f8e..d582720 100644 --- a/include_dir/Cargo.toml +++ b/include_dir/Cargo.toml @@ -5,4 +5,7 @@ authors = ["Michael Bryan <michaelfbryan@gmail.com>"] [dependencies] include_dir_impl = { path = "../include_dir_impl" } -proc-macro-hack = "0.4" \ No ...
6
109
13
a84492657c053542eb21a8d8e110753f49930744
Michael Bryan
2018-05-30T14:21:22
Created the empty crates
diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..16e40d6 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,2 @@ +[workspace] +members = ["include_dir", "include_dir_impl"] \ No newline at end of file diff --git a/include_dir/Cargo.toml b/include_dir/Cargo.toml new file mode 100644 index 0000000..4df1f8e...
5
35
0
ec0ef9378efdf2379e5a655dd3e58f64ac864451
Michael Bryan
2018-02-09T05:15:31
(cargo-release) start next development iteration 0.1.6-alpha.0
diff --git a/Cargo.toml b/Cargo.toml index d865676..6446baf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["include", "embed", "assets"] license = "MIT" name = "include_dir" repository = "https://github.com/Michael-F-Bryan/include_dir" -version = "0.1.5" +version = "0.1.6-alpha.0" [package...
1
1
1
f0a6896e35523e9facd77352e8b9212326c315d7
Michael Bryan
2018-02-09T05:14:40
Bumped dependency versions
diff --git a/Cargo.toml b/Cargo.toml index 2362e7f..d865676 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,12 @@ branch = "master" repository = "Michael-F-Bryan/include_dir" [dependencies] -error-chain = "^0.11.0" -glob = "^0.2.11" +error-chain = "0.11" +glob = "0.2" [dev-dependencies] -tempdir = "^0.3.5...
1
4
4
104f69178eb0b86bdcfa87c86418be2c0a2e3e2d
Michael Bryan
2018-02-09T05:12:43
Added cargo-release metadata
diff --git a/Cargo.toml b/Cargo.toml index 928b3c4..2362e7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,10 @@ name = "include_dir" repository = "https://github.com/Michael-F-Bryan/include_dir" version = "0.1.5" -[badges] + +[package.metadata.release] +sign-commit = true +tag-prefix = "v" [badges.appveyor...
1
4
1
a034749aabb9244bd6a3102ea22e989d2a76dec2
Yurii Rashkovskii
2018-02-09T03:59:08
Problem: can't compile on Windows (#28) include_dir!("..\..") doesn't have backslashes escaped Solution: use raw strings to avoid the issue
diff --git a/src/serializer.rs b/src/serializer.rs index 8097a31..2331413 100644 --- a/src/serializer.rs +++ b/src/serializer.rs @@ -30,7 +30,7 @@ impl<W> Serializer<W> write!(self.writer, r#"File {{ path: r"{0}", - contents: include_bytes!("{0}"), + ...
1
1
1
3f7eaef65ab15246e1b4c1e85b75e88746c14948
Michael Bryan
2017-09-23T16:25:50
Version number bump
diff --git a/Cargo.toml b/Cargo.toml index 6d32a88..928b3c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["include", "embed", "assets"] license = "MIT" name = "include_dir" repository = "https://github.com/Michael-F-Bryan/include_dir" -version = "0.1.4" +version = "0.1.5" [badges]
1
1
1
d32e814899ce47933a3a01da84c750a963f23f0a
Michael Bryan
2017-09-23T16:07:05
Updated dependencies
diff --git a/Cargo.toml b/Cargo.toml index 4a3cca3..6d32a88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,12 +21,12 @@ branch = "master" repository = "Michael-F-Bryan/include_dir" [dependencies] -error-chain = "0.10.0" -glob = "0.2.11" +error-chain = "^0.11.0" +glob = "^0.2.11" [dev-dependencies] -tempdir = "0...
1
4
4
6c2f8572029d9831c4cbd4ea6de880dd8e5d1e6c
Andreas Reischuck
2017-09-22T00:15:00
restored the `file_only_works_on_files` test
diff --git a/src/files.rs b/src/files.rs index fde9869..9551421 100644 --- a/src/files.rs +++ b/src/files.rs @@ -40,6 +40,7 @@ mod tests { use super::*; use std::io::{Seek, SeekFrom, Write}; use tempfile::NamedTempFile; + use tempdir::TempDir; fn dummy_file() -> NamedTempFile { let mut...
1
3
3
1eea5c9ef03cd30e8c7d42dbfacf39a641e67a31
Andreas Reischuck
2017-09-21T13:16:07
cleanup unused code
diff --git a/src/files.rs b/src/files.rs index 61ae2d6..fde9869 100644 --- a/src/files.rs +++ b/src/files.rs @@ -40,7 +40,6 @@ mod tests { use super::*; use std::io::{Seek, SeekFrom, Write}; use tempfile::NamedTempFile; - //use tempdir::TempDir; fn dummy_file() -> NamedTempFile { let m...
1
0
1
a0d4f59d826e8afad81d10ccb50c89db239d4c5a
Andreas Reischuck
2017-09-21T13:13:56
use include_bytes! for target and definitions
diff --git a/src/files.rs b/src/files.rs index 0b62e4d..61ae2d6 100644 --- a/src/files.rs +++ b/src/files.rs @@ -1,5 +1,4 @@ use std::path::{Path, PathBuf}; -use std::fs; use errors::*; use helpers::Locatable; @@ -28,11 +27,6 @@ impl File { pub fn name(&self) -> &Path { &self.path } - - /// T...
4
263
352
d18e3fd29ecf57a6ce624b6e423afca7c1e4f47c
Michael-F-Bryan
2017-06-10T10:28:28
Version bump
diff --git a/Cargo.toml b/Cargo.toml index 04be739..4a3cca3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["include", "embed", "assets"] license = "MIT" name = "include_dir" repository = "https://github.com/Michael-F-Bryan/include_dir" -version = "0.1.3" +version = "0.1.4" [badges] @@ -30,...
1
2
2
ef6987128ac53a53bd04e9d3e3026845238e38ee
Michael-F-Bryan
2017-06-10T09:44:56
Added more docs for the generated Dir::glob() method
diff --git a/integration_tests/globs.rs b/integration_tests/globs.rs index 01e7e90..4b90ee5 100644 --- a/integration_tests/globs.rs +++ b/integration_tests/globs.rs @@ -18,9 +18,6 @@ fn main() { DirEntry::File(f) => println!("{}\t({} bytes)", f.path().display(), f.contents.len()), } } - - ...
2
45
10
dab2b6c943e38552f85a5ed4f45cdb2364175eff
Michael-F-Bryan
2017-06-10T09:26:49
Turns out we need Dir::name() after all
diff --git a/src/dirs.rs b/src/dirs.rs index b6d3c75..0b9559a 100644 --- a/src/dirs.rs +++ b/src/dirs.rs @@ -97,6 +97,12 @@ pub struct Dir { impl Dir { + /// Get the directory's name + #[allow(dead_code)] + pub fn name(&self) -> &str { + self.path.file_name().unwrap().to_str().unwrap() + } + ...
1
6
0
f4d3657692db212f7d1686bef0c31be5b99fd4ca
Michael-F-Bryan
2017-06-10T09:13:26
Changed the globs integration test to use a bigger directory
diff --git a/integration_tests/globs.rs b/integration_tests/globs.rs index 0d091b8..01e7e90 100644 --- a/integration_tests/globs.rs +++ b/integration_tests/globs.rs @@ -1,23 +1,26 @@ +// I'm using a django project on my local machine +// ROOT: /home/michael/Documents/website // FEATURE: globs -// IGNORE: .git target +...
2
14
16
c125b29f2a58be1c3b5217ad8d22799e102afbb5
Michael-F-Bryan
2017-06-10T09:13:06
Added size info to the generated Dir
diff --git a/integration_tests/basic_file_access.rs b/integration_tests/basic_file_access.rs index 4012f43..c994af5 100644 --- a/integration_tests/basic_file_access.rs +++ b/integration_tests/basic_file_access.rs @@ -31,6 +31,8 @@ fn main() { for dir in ASSETS.subdirs { println!("\t{}", dir.path().display...
2
9
0
889ceeb453f1a2f46bef8e46777bebf44b2858bd
Michael-F-Bryan
2017-06-10T08:21:22
Fixed a bug where windows paths aren't escaped
diff --git a/src/serializer.rs b/src/serializer.rs index 3cd2ae0..4d6e89f 100644 --- a/src/serializer.rs +++ b/src/serializer.rs @@ -31,7 +31,7 @@ impl<W> Serializer<W> // TODO: Use a buffered reader here for easy perf gains let contents = BufReader::new(f.contents()?); write!(self.writer, - ...
1
2
2
0de893007802e2d089ed91775d3161ed8bde1dd7
Michael-F-Bryan
2017-06-10T08:19:46
Added docs about the globs feature
diff --git a/src/lib.rs b/src/lib.rs index 8fbda75..399e6d6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -40,6 +40,28 @@ //! generation, the best reference for features and examples will be the //! [integration tests] directory. //! +//! +//! # Features +//! +//! By default `include_dir` requires no extra runtime dep...
1
22
0
9e89c816401c6bd798945f31bbba5273d1e1bf33
Michael-F-Bryan
2017-06-09T23:42:25
Added an integration test for the globs feature
diff --git a/integration_tests/find_file.rs b/integration_tests/find_file.rs index fadb4fa..b8b5072 100644 --- a/integration_tests/find_file.rs +++ b/integration_tests/find_file.rs @@ -1,8 +1,3 @@ -// INCLUDE: src -// FEATURE: globs -// IGNORE: .git target - -extern crate glob; use assets::ASSETS; fn main() { @@ -1...
2
26
17
71e9fcdeac075c206406da04d237cbcaf0f3cc38
Michael-F-Bryan
2017-06-09T20:42:38
Updated the example in lib.rs
diff --git a/src/lib.rs b/src/lib.rs index 8267ea2..8fbda75 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,10 +22,16 @@ //! ``` //! //! Then in one of your source files, you'll need to include the generated -//! `assets.rs` file. +//! `assets.rs` file. Notice that it's been included as a submodule, that +//! way th...
1
8
2
69e3071e9c282bf905e5520250cb5d81310953b2
Michael-F-Bryan
2017-06-09T20:31:42
Updated some of the embedded docs
diff --git a/src/serializer.rs b/src/serializer.rs index 64e002b..3cd2ae0 100644 --- a/src/serializer.rs +++ b/src/serializer.rs @@ -92,9 +92,15 @@ impl<W> Serializer<W> self.path.as_ref() } + /// The file's name (everything after the last slash). ...
1
9
2
66673162870b2a1fc152aa78843fcd2e6b77fde7
Michael-F-Bryan
2017-06-09T19:50:19
Converted the generated code to use full paths
diff --git a/integration_tests/basic_file_access.rs b/integration_tests/basic_file_access.rs index 91d893e..68c92a3 100644 --- a/integration_tests/basic_file_access.rs +++ b/integration_tests/basic_file_access.rs @@ -1,10 +1,10 @@ use assets::ASSETS; fn main() { - println!("Asset directory: {}", ASSETS.name); + ...
3
50
15
f1a85a5966470f0afb3df4ff3200ffa1679a739d
Michael-F-Bryan
2017-06-09T19:32:56
Updated the write_file() method to lazily read from the file
diff --git a/src/serializer.rs b/src/serializer.rs index 6edc8fb..9f9050a 100644 --- a/src/serializer.rs +++ b/src/serializer.rs @@ -1,4 +1,4 @@ -use std::io::Write; +use std::io::{Write, Read}; use std::path::{Path, PathBuf}; use files::File; @@ -27,10 +27,18 @@ impl<W> Serializer<W> } fn write_file(&m...
1
12
4
87413b10206d2ad8093c3195c2341517378af026
Michael-F-Bryan
2017-06-09T19:22:09
All datastructures keep track of their absolute path now
diff --git a/Cargo.toml b/Cargo.toml index ca890b6..4ec85c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,21 +1,28 @@ [package] authors = ["Michael-F-Bryan <michaelfbryan@gmail.com>"] -name = "include_dir" -version = "0.1.3" +categories = ["development-tools", "web-programming", "game-engines"] description = "The l...
6
84
52
c5555f9be3194c1495c4389f2bb1cf01fc8e91c8
Michael-F-Bryan
2017-06-09T17:16:43
dirs_in_dir can now ignore things
diff --git a/src/dirs.rs b/src/dirs.rs index e1fe4c0..8997cd5 100644 --- a/src/dirs.rs +++ b/src/dirs.rs @@ -60,11 +60,17 @@ pub fn include_dir<P: AsRef<Path>>(root: P) -> Result<Dir> { } fn dirs_in_dir<P: AsRef<Path>>(root: P, options: &Options) -> Result<Vec<Dir>> { - root.as_ref() + let dirs = root.as_ref(...
1
18
1
13c8fe27b32fecf5bdd5785a6b6fdb0d1a56ddac
Michael-F-Bryan
2017-06-09T17:07:16
Can ignore specified files
diff --git a/src/dirs.rs b/src/dirs.rs index 40f817e..e1fe4c0 100644 --- a/src/dirs.rs +++ b/src/dirs.rs @@ -17,6 +17,19 @@ impl Options { self.ignore.push(name.to_string()); self } + + fn is_ignored<P: AsRef<Path>>(&self, path: P) -> bool { + for ignore in &self.ignore { + p...
1
32
2
4248f5711327a18df91bb1d4096efdf9622f0b67
Michael-F-Bryan
2017-06-09T16:52:40
Added in an options config object
diff --git a/src/dirs.rs b/src/dirs.rs index 7e030bb..40f817e 100644 --- a/src/dirs.rs +++ b/src/dirs.rs @@ -3,9 +3,23 @@ use std::path::{Path, PathBuf}; use files::{include_file, File}; use errors::*; +#[derive(Clone, Debug, Default, PartialEq)] +pub struct Options { + ignore: Vec<String>, +} -/// Traverse a ...
1
26
7
9ad443c181299cda8644c74a0b86c45d0c455463
Michael-F-Bryan
2017-06-08T00:36:28
Added some better docs for the compiled code
diff --git a/src/lib.rs b/src/lib.rs index 8fedc73..01e338a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,6 +27,14 @@ //! ```rust,ignore //! include!(concat!(env!("OUT_DIR"), "/assets.rs")); //! ``` +//! +//! # Note +//! +//! Because a large part of this crate's functionality comes from code +//! generation, the b...
2
43
7