Skip to content

Commit fc7a112

Browse files
committed
auto merge of #12896 : alexcrichton/rust/goodbye-extra, r=brson
This commit shreds all remnants of libextra from the compiler and standard distribution. Two modules, c_vec/tempfile, were moved into libstd after some cleanup, and the other modules were moved to separate crates as seen fit. Closes #8784 Closes #12413 Closes #12576
2 parents 2682c47 + 58e4ab2 commit fc7a112

File tree

158 files changed

+311
-869
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+311
-869
lines changed

mk/crates.mk

+9-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#
3838
# DEPS_<crate>
3939
# These lists are the dependencies of the <crate> that is to be built.
40-
# Rust dependencies are listed bare (i.e. std, extra, green) and native
40+
# Rust dependencies are listed bare (i.e. std, green) and native
4141
# dependencies have a "native:" prefix (i.e. native:sundown). All deps
4242
# will be built before the crate itself is built.
4343
#
@@ -49,23 +49,23 @@
4949
# automatically generated for all stage/host/target combinations.
5050
################################################################################
5151

52-
TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
53-
uuid serialize sync getopts collections num test time rand
52+
TARGET_CRATES := std green rustuv native flate arena glob term semver \
53+
uuid serialize sync getopts collections num test time rand \
54+
workcache url
5455
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
5556
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5657
TOOLS := compiletest rustdoc rustc
5758

5859
DEPS_std := native:rustrt native:compiler-rt native:backtrace
59-
DEPS_extra := std term sync serialize getopts collections time rand
6060
DEPS_green := std rand native:context_switch
6161
DEPS_rustuv := std native:uv native:uv_support
6262
DEPS_native := std
6363
DEPS_syntax := std term serialize collections
6464
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
65-
collections time extra
65+
collections time
6666
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
6767
test time
68-
DEPS_flate := std extra native:miniz
68+
DEPS_flate := std native:miniz
6969
DEPS_arena := std collections
7070
DEPS_glob := std
7171
DEPS_serialize := std collections
@@ -78,9 +78,11 @@ DEPS_collections := std rand
7878
DEPS_fourcc := syntax std
7979
DEPS_hexfloat := syntax std
8080
DEPS_num := std rand
81-
DEPS_test := std extra collections getopts serialize term
81+
DEPS_test := std collections getopts serialize term time
8282
DEPS_time := std serialize
8383
DEPS_rand := std
84+
DEPS_url := std collections
85+
DEPS_workcache := std serialize collections std
8486

8587
TOOL_DEPS_compiletest := test green rustuv getopts
8688
TOOL_DEPS_rustdoc := rustdoc native

src/doc/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ li {list-style-type: none; }
5050
* [The `test` library containing the unit-testing & micro-benchmark framework](test/index.html)
5151
* [The `time` library](time/index.html)
5252
* [The `uuid` 128-bit universally unique identifier library](uuid/index.html)
53+
* [The `url` library](url/index.html)
54+
* [The `workcache` library](workcache/index.html)
5355

5456
# Tooling
5557

src/doc/rust.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -787,9 +787,9 @@ Four examples of `extern crate` declarations:
787787
~~~~ {.ignore}
788788
extern crate pcre;
789789
790-
extern crate extra; // equivalent to: extern crate extra = "extra";
790+
extern crate std; // equivalent to: extern crate std = "std";
791791
792-
extern crate rustextra = "extra"; // linking to 'extra' under another name
792+
extern crate ruststd = "std"; // linking to 'std' under another name
793793
794794
extern crate foo = "some/where/rust-foo#foo:1.0"; // a full package ID for external tools
795795
~~~~

src/doc/tutorial.md

-11
Original file line numberDiff line numberDiff line change
@@ -3228,17 +3228,6 @@ See the [API documentation][stddoc] for details.
32283228

32293229
[stddoc]: std/index.html
32303230

3231-
## The extra library
3232-
3233-
Rust ships with crates such as the [extra library], an accumulation of useful things,
3234-
that are however not important enough to deserve a place in the standard
3235-
library. You can link to a library such as `extra` with an `extern crate extra;`.
3236-
3237-
[extra library]: extra/index.html
3238-
3239-
Right now `extra` contains those definitions directly, but in the future it will likely just
3240-
re-export a bunch of 'officially blessed' crates that get managed with a package manager.
3241-
32423231
# What next?
32433232

32443233
Now that you know the essentials, check out any of the additional

src/etc/combine-tests.py

-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def scrub(b):
5656
#[feature(globs, macro_rules, struct_variant, managed_boxes)];
5757
#[allow(warnings)];
5858
extern crate collections;
59-
extern crate extra;
6059
"""
6160
)
6261
for t in stage2_tests:
@@ -73,7 +72,6 @@ def scrub(b):
7372
"""
7473
// AUTO-GENERATED FILE: DO NOT EDIT
7574
#[feature(globs, managed_boxes)];
76-
extern crate extra;
7775
extern crate run_pass_stage2;
7876
use run_pass_stage2::*;
7977
use std::io;

src/etc/generate-deriving-span-tests.py

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
// This file was auto-generated using 'src/etc/generate-keyword-span-tests.py'
3939
4040
#[feature(struct_variant)];
41-
extern crate extra;
4241
extern crate rand;
4342
4443
{error_deriving}

src/libextra/c_vec.rs

-240
This file was deleted.

0 commit comments

Comments
 (0)