Skip to content

Commit fde11e7

Browse files
committed
auto merge of #12012 : omasanori/rust/semver, r=alexcrichton
Done as a part of #8784.
2 parents d42521a + fdb820a commit fde11e7

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

mk/crates.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# automatically generated for all stage/host/target combinations.
5050
################################################################################
5151

52-
TARGET_CRATES := std extra green rustuv native flate arena glob term
52+
TARGET_CRATES := std extra green rustuv native flate arena glob term semver
5353
HOST_CRATES := syntax rustc rustdoc
5454
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5555
TOOLS := compiletest rustdoc rustc
@@ -66,6 +66,7 @@ DEPS_flate := std native:miniz
6666
DEPS_arena := std extra
6767
DEPS_glob := std
6868
DEPS_term := std
69+
DEPS_semver := std
6970

7071
TOOL_DEPS_compiletest := extra green rustuv
7172
TOOL_DEPS_rustdoc := rustdoc green rustuv

src/doc/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ li {list-style-type: none; }
4040
* [The `arena` allocation library](arena/index.html)
4141
* [The `flate` compression library](flate/index.html)
4242
* [The `glob` file path matching library](glob/index.html)
43+
* [The `semver` version collation library](semver/index.html)
4344
* [The `term` terminal-handling library](term/index.html)
4445

4546
# Tooling

src/libextra/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ pub mod rational;
8383
#[path="num/complex.rs"]
8484
pub mod complex;
8585
pub mod stats;
86-
pub mod semver;
8786
pub mod hex;
8887
pub mod uuid;
8988

src/libextra/semver.rs renamed to src/libsemver/lib.rs

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
//! An example version number with all five components is
2929
//! `0.8.1-rc.3.0+20130922.linux`.
3030
31+
#[crate_id = "semver#0.10-pre"];
32+
#[crate_type = "rlib"];
33+
#[crate_type = "dylib"];
34+
#[license = "MIT/ASL2"];
35+
3136
use std::char;
3237
use std::cmp;
3338
use std::option::{Option, Some, None};

0 commit comments

Comments
 (0)