Skip to content

Commit

Permalink
auto merge of #12012 : omasanori/rust/semver, r=alexcrichton
Browse files Browse the repository at this point in the history
Done as a part of #8784.
  • Loading branch information
bors committed Feb 3, 2014
2 parents d42521a + fdb820a commit fde11e7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion mk/crates.mk
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/doc/index.md
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/libextra/lib.rs
Expand Up @@ -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;

Expand Down
5 changes: 5 additions & 0 deletions src/libextra/semver.rs → src/libsemver/lib.rs
Expand Up @@ -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};
Expand Down

0 comments on commit fde11e7

Please sign in to comment.