Skip to content

Commit ef141be

Browse files
committed
chore: single global example_dirs
1 parent a4a8bc3 commit ef141be

37 files changed

Lines changed: 321 additions & 55 deletions

File tree

Cargo.lock

Lines changed: 16 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace]
22
members = [
3-
"dir-structure",
3+
"dir-structure", "dir-structure-git-vfs", "dir-structure-include-dir-vfs",
44
"dir-structure-macros",
55
"dir-structure-resolve-core",
66
"dir-structure-tools",

dir-structure-git-vfs/Cargo.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[package]
2+
name = "dir-structure-git-vfs"
3+
version.workspace = true
4+
edition.workspace = true
5+
homepage.workspace = true
6+
repository.workspace = true
7+
description.workspace = true
8+
keywords.workspace = true
9+
license.workspace = true
10+
11+
[dependencies]
12+
dir-structure.workspace = true
13+
git2.workspace = true
14+
15+
[lints]
16+
workspace = true

dir-structure-git-vfs/example_dirs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../example_dirs/
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../example_dirs/

dir-structure/examples/reading_from_git_vfs.rs renamed to dir-structure-git-vfs/examples/reading_from_git_vfs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::path::Path;
1313
use std::pin::Pin;
1414

1515
use dir_structure::prelude::*;
16-
use dir_structure::vfs::git_vfs::GitVfs;
16+
use dir_structure_git_vfs::GitVfs;
1717
use git2::Index;
1818

1919
mod example_dirs;
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ use std::path::Path;
77
use std::path::PathBuf;
88
use std::pin::Pin;
99

10-
use crate::error::Error;
11-
use crate::error::Result;
12-
use crate::error::VfsResult;
13-
use crate::traits::vfs;
14-
use crate::traits::vfs::PathType;
15-
use crate::traits::vfs::VfsCore;
10+
use dir_structure::error::Error;
11+
use dir_structure::error::Result;
12+
use dir_structure::error::VfsResult;
13+
use dir_structure::traits::vfs;
14+
use dir_structure::traits::vfs::PathType;
15+
use dir_structure::traits::vfs::VfsCore;
1616

1717
/// A virtual filesystem that reads from a git repository.
1818
pub struct GitVfs<'r> {
@@ -199,10 +199,10 @@ mod tests {
199199
use std::path::Path;
200200
use std::pin::Pin;
201201

202-
use crate::prelude::Vfs;
203-
use crate::traits::vfs;
204-
use crate::traits::vfs::DirWalker;
205-
use crate::vfs::git_vfs::GitVfs;
202+
use dir_structure::prelude::Vfs;
203+
use dir_structure::traits::vfs;
204+
use dir_structure::traits::vfs::DirWalker;
205+
use super::GitVfs;
206206

207207
fn open_repo() -> git2::Repository {
208208
git2::Repository::open_from_env().expect("Failed to open git repository")
@@ -222,7 +222,7 @@ mod tests {
222222
let content = vfs
223223
.read_string(Path::new("README.md"))
224224
.expect("Failed to read README.md");
225-
assert_eq!(content, include_str!("../../../README.md"));
225+
assert_eq!(content, include_str!("../../README.md"));
226226
}
227227

228228
#[test]
@@ -263,7 +263,7 @@ mod tests {
263263
let mut content = String::new();
264264
file.read_to_string(&mut content)
265265
.expect("Failed to read README.md");
266-
assert_eq!(content, include_str!("../../../README.md"));
266+
assert_eq!(content, include_str!("../../README.md"));
267267
}
268268

269269
#[test]
@@ -349,3 +349,4 @@ mod tests {
349349
);
350350
}
351351
}
352+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[package]
2+
name = "dir-structure-include-dir-vfs"
3+
version.workspace = true
4+
edition.workspace = true
5+
homepage.workspace = true
6+
repository.workspace = true
7+
description.workspace = true
8+
keywords.workspace = true
9+
license.workspace = true
10+
11+
[dependencies]
12+
dir-structure.workspace = true
13+
include_dir = { version = "0.7", default-features = false }
14+
15+
[dev-dependencies]
16+
dir-structure = { workspace = true, features = ["derive"] }
17+
18+
[lints]
19+
workspace = true
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../example_dirs/

dir-structure/examples/reading_from_include_dir_vfs.rs renamed to dir-structure-include-dir-vfs/examples/reading_from_include_dir_vfs.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ struct Dir {
1717
}
1818

1919
fn main() -> Result<(), Box<dyn std::error::Error>> {
20-
let vfs = dir_structure::include_dir_vfs!("$CARGO_MANIFEST_DIR/examples/example_dirs/reading");
20+
let vfs = dir_structure_include_dir_vfs::IncludeDirVfs::new(
21+
dir_structure_include_dir_vfs::include_dir::include_dir!(
22+
"$CARGO_MANIFEST_DIR/examples/example_dirs/reading"
23+
),
24+
);
2125

2226
// either
2327
let dir = Dir::read_from(Path::new("."), Pin::new(&vfs))?;

0 commit comments

Comments
 (0)