Skip to content

Commit

Permalink
extra: Put the nail in the coffin, delete libextra
Browse files Browse the repository at this point in the history
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
  • Loading branch information
alexcrichton committed Mar 14, 2014
1 parent e99d523 commit 58e4ab2
Show file tree
Hide file tree
Showing 158 changed files with 311 additions and 869 deletions.
16 changes: 9 additions & 7 deletions mk/crates.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#
# DEPS_<crate>
# These lists are the dependencies of the <crate> that is to be built.
# Rust dependencies are listed bare (i.e. std, extra, green) and native
# Rust dependencies are listed bare (i.e. std, green) and native
# dependencies have a "native:" prefix (i.e. native:sundown). All deps
# will be built before the crate itself is built.
#
Expand All @@ -49,23 +49,23 @@
# automatically generated for all stage/host/target combinations.
################################################################################

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

DEPS_std := native:rustrt native:compiler-rt native:backtrace
DEPS_extra := std term sync serialize getopts collections time rand
DEPS_green := std rand native:context_switch
DEPS_rustuv := std native:uv native:uv_support
DEPS_native := std
DEPS_syntax := std term serialize collections
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
collections time extra
collections time
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
test time
DEPS_flate := std extra native:miniz
DEPS_flate := std native:miniz
DEPS_arena := std collections
DEPS_glob := std
DEPS_serialize := std collections
Expand All @@ -78,9 +78,11 @@ DEPS_collections := std rand
DEPS_fourcc := syntax std
DEPS_hexfloat := syntax std
DEPS_num := std rand
DEPS_test := std extra collections getopts serialize term
DEPS_test := std collections getopts serialize term time
DEPS_time := std serialize
DEPS_rand := std
DEPS_url := std collections
DEPS_workcache := std serialize collections std

TOOL_DEPS_compiletest := test green rustuv getopts
TOOL_DEPS_rustdoc := rustdoc native
Expand Down
2 changes: 2 additions & 0 deletions src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ li {list-style-type: none; }
* [The `test` library containing the unit-testing & micro-benchmark framework](test/index.html)
* [The `time` library](time/index.html)
* [The `uuid` 128-bit universally unique identifier library](uuid/index.html)
* [The `url` library](url/index.html)
* [The `workcache` library](workcache/index.html)

# Tooling

Expand Down
4 changes: 2 additions & 2 deletions src/doc/rust.md
Original file line number Diff line number Diff line change
Expand Up @@ -787,9 +787,9 @@ Four examples of `extern crate` declarations:
~~~~ {.ignore}
extern crate pcre;
extern crate extra; // equivalent to: extern crate extra = "extra";
extern crate std; // equivalent to: extern crate std = "std";
extern crate rustextra = "extra"; // linking to 'extra' under another name
extern crate ruststd = "std"; // linking to 'std' under another name
extern crate foo = "some/where/rust-foo#foo:1.0"; // a full package ID for external tools
~~~~
Expand Down
11 changes: 0 additions & 11 deletions src/doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -3228,17 +3228,6 @@ See the [API documentation][stddoc] for details.

[stddoc]: std/index.html

## The extra library

Rust ships with crates such as the [extra library], an accumulation of useful things,
that are however not important enough to deserve a place in the standard
library. You can link to a library such as `extra` with an `extern crate extra;`.

[extra library]: extra/index.html

Right now `extra` contains those definitions directly, but in the future it will likely just
re-export a bunch of 'officially blessed' crates that get managed with a package manager.

# What next?

Now that you know the essentials, check out any of the additional
Expand Down
2 changes: 0 additions & 2 deletions src/etc/combine-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ def scrub(b):
#[feature(globs, macro_rules, struct_variant, managed_boxes)];
#[allow(warnings)];
extern crate collections;
extern crate extra;
"""
)
for t in stage2_tests:
Expand All @@ -73,7 +72,6 @@ def scrub(b):
"""
// AUTO-GENERATED FILE: DO NOT EDIT
#[feature(globs, managed_boxes)];
extern crate extra;
extern crate run_pass_stage2;
use run_pass_stage2::*;
use std::io;
Expand Down
1 change: 0 additions & 1 deletion src/etc/generate-deriving-span-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
// This file was auto-generated using 'src/etc/generate-keyword-span-tests.py'
#[feature(struct_variant)];
extern crate extra;
extern crate rand;
{error_deriving}
Expand Down
240 changes: 0 additions & 240 deletions src/libextra/c_vec.rs

This file was deleted.

Loading

5 comments on commit 58e4ab2

@bors
Copy link
Contributor

@bors bors commented on 58e4ab2 Mar 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at alexcrichton@58e4ab2

@bors
Copy link
Contributor

@bors bors commented on 58e4ab2 Mar 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/goodbye-extra = 58e4ab2 into auto

@bors
Copy link
Contributor

@bors bors commented on 58e4ab2 Mar 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/goodbye-extra = 58e4ab2 merged ok, testing candidate = fc7a112

@bors
Copy link
Contributor

@bors bors commented on 58e4ab2 Mar 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = fc7a112

Please sign in to comment.