diff options
| author | bors <bors@rust-lang.org> | 2014-02-03 15:11:44 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-03 15:11:44 -0800 |
| commit | fde11e7ae5b9b67dfdf23862f60f4ee4dae4910f (patch) | |
| tree | 72bd687dcfe75e5258146baee470be6ee0ed95f7 | |
| parent | d42521aa92006a3378c535adec80ae2257bff083 (diff) | |
| parent | fdb820a1be9d28220a2e509b1f29e5381516c9ee (diff) | |
| download | rust-fde11e7ae5b9b67dfdf23862f60f4ee4dae4910f.tar.gz rust-fde11e7ae5b9b67dfdf23862f60f4ee4dae4910f.zip | |
auto merge of #12012 : omasanori/rust/semver, r=alexcrichton
Done as a part of #8784.
| -rw-r--r-- | mk/crates.mk | 3 | ||||
| -rw-r--r-- | src/doc/index.md | 1 | ||||
| -rw-r--r-- | src/libextra/lib.rs | 1 | ||||
| -rw-r--r-- | src/libsemver/lib.rs (renamed from src/libextra/semver.rs) | 5 |
4 files changed, 8 insertions, 2 deletions
diff --git a/mk/crates.mk b/mk/crates.mk index b447dbda9e0..f3d71da9eaa 100644 --- a/mk/crates.mk +++ b/mk/crates.mk @@ -49,7 +49,7 @@ # automatically generated for all stage/host/target combinations. ################################################################################ -TARGET_CRATES := std extra green rustuv native flate arena glob term +TARGET_CRATES := std extra green rustuv native flate arena glob term semver HOST_CRATES := syntax rustc rustdoc CRATES := $(TARGET_CRATES) $(HOST_CRATES) TOOLS := compiletest rustdoc rustc @@ -66,6 +66,7 @@ DEPS_flate := std native:miniz DEPS_arena := std extra DEPS_glob := std DEPS_term := std +DEPS_semver := std TOOL_DEPS_compiletest := extra green rustuv TOOL_DEPS_rustdoc := rustdoc green rustuv diff --git a/src/doc/index.md b/src/doc/index.md index 730c9c744f6..a639ca16f35 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -40,6 +40,7 @@ li {list-style-type: none; } * [The `arena` allocation library](arena/index.html) * [The `flate` compression library](flate/index.html) * [The `glob` file path matching library](glob/index.html) +* [The `semver` version collation library](semver/index.html) * [The `term` terminal-handling library](term/index.html) # Tooling diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs index 358dca5e5ac..2c417026065 100644 --- a/src/libextra/lib.rs +++ b/src/libextra/lib.rs @@ -83,7 +83,6 @@ pub mod rational; #[path="num/complex.rs"] pub mod complex; pub mod stats; -pub mod semver; pub mod hex; pub mod uuid; diff --git a/src/libextra/semver.rs b/src/libsemver/lib.rs index 0faf4ee664e..01feb1c8c0d 100644 --- a/src/libextra/semver.rs +++ b/src/libsemver/lib.rs @@ -28,6 +28,11 @@ //! An example version number with all five components is //! `0.8.1-rc.3.0+20130922.linux`. +#[crate_id = "semver#0.10-pre"]; +#[crate_type = "rlib"]; +#[crate_type = "dylib"]; +#[license = "MIT/ASL2"]; + use std::char; use std::cmp; use std::option::{Option, Some, None}; |