diff options
| author | David Manescu <david.manescu@gmail.com> | 2014-01-29 13:51:33 +1100 |
|---|---|---|
| committer | David Manescu <david.manescu@gmail.com> | 2014-01-29 17:23:28 +1100 |
| commit | 93398d16ec816cd56eb5321d27ccbf46b9049815 (patch) | |
| tree | 205c0d19ea0d72dcad79e000b81303c434eae194 /src | |
| parent | 4d0d3da9e4d16bdbf509837b4f981db39328cfe0 (diff) | |
| download | rust-93398d16ec816cd56eb5321d27ccbf46b9049815.tar.gz rust-93398d16ec816cd56eb5321d27ccbf46b9049815.zip | |
extra: move glob to libglob
In line with the dissolution of libextra - moves glob to its own library libglob. Changes based on PR #11787. Updates .gitignore to ignore doc/glob.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libextra/lib.rs | 1 | ||||
| -rw-r--r-- | src/libglob/lib.rs (renamed from src/libextra/glob.rs) | 11 | ||||
| -rw-r--r-- | src/test/run-pass/glob-std.rs | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs index 6e3f5fd4b95..bb89915dfd1 100644 --- a/src/libextra/lib.rs +++ b/src/libextra/lib.rs @@ -67,7 +67,6 @@ pub mod ebml; pub mod getopts; pub mod json; pub mod tempfile; -pub mod glob; pub mod term; pub mod time; pub mod base64; diff --git a/src/libextra/glob.rs b/src/libglob/lib.rs index fb760685254..98bf5533210 100644 --- a/src/libextra/glob.rs +++ b/src/libglob/lib.rs @@ -23,6 +23,11 @@ * `glob`/`fnmatch` functions. */ +#[crate_id = "glob#0.10-pre"]; +#[crate_type = "rlib"]; +#[crate_type = "dylib"]; +#[license = "MIT/ASL2"]; + use std::{os, path}; use std::io; use std::io::fs; @@ -53,7 +58,7 @@ pub struct Paths { /// `puppies.jpg` and `hamsters.gif`: /// /// ```rust -/// use extra::glob::glob; +/// use glob::glob; /// /// for path in glob("/media/pictures/*.jpg") { /// println!("{}", path.display()); @@ -297,7 +302,7 @@ impl Pattern { * # Example * * ```rust - * use extra::glob::Pattern; + * use glob::Pattern; * * assert!(Pattern::new("c?t").matches("cat")); * assert!(Pattern::new("k[!e]tteh").matches("kitteh")); @@ -537,7 +542,7 @@ impl MatchOptions { #[cfg(test)] mod test { use std::os; - use super::*; + use super::{glob, Pattern, MatchOptions}; #[test] fn test_absolute_pattern() { diff --git a/src/test/run-pass/glob-std.rs b/src/test/run-pass/glob-std.rs index 655bc777193..9e724d86df5 100644 --- a/src/test/run-pass/glob-std.rs +++ b/src/test/run-pass/glob-std.rs @@ -12,8 +12,9 @@ // xfail-win32 TempDir may cause IoError on windows: #10462 extern mod extra; +extern mod glob; -use extra::glob::glob; +use glob::glob; use extra::tempfile::TempDir; use std::unstable::finally::Finally; use std::{os, unstable}; |