Skip to content

Commit

Permalink
extra: move arena to libarena
Browse files Browse the repository at this point in the history
In line with the dissolution of libextra - #8784 - moves arena to its own library libarena.
Changes based on PR #11787. Updates .gitignore to ignore doc/arena.
  • Loading branch information
dmanescu committed Jan 29, 2014
1 parent edfb546 commit 4d0d3da
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -74,6 +74,7 @@ src/.DS_Store
/doc/html
/doc/latex
/doc/std
/doc/arena
/doc/extra
/doc/flate
/doc/green
Expand Down
1 change: 1 addition & 0 deletions doc/index.md
Expand Up @@ -37,6 +37,7 @@ li {list-style-type: none; }
* [The Rust parser, `libsyntax`](syntax/index.html)
* [The Rust compiler, `librustc`](rustc/index.html)

* [The `arena` allocation library](arena/index.html)
* [The `flate` compression library](flate/index.html)

# Tooling
Expand Down
5 changes: 3 additions & 2 deletions 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
TARGET_CRATES := std extra green rustuv native flate arena
HOST_CRATES := syntax rustc rustdoc rustpkg
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
TOOLS := compiletest rustpkg rustdoc rustc
Expand All @@ -60,10 +60,11 @@ DEPS_green := std
DEPS_rustuv := std native:uv native:uv_support
DEPS_native := std
DEPS_syntax := std extra
DEPS_rustc := syntax native:rustllvm flate
DEPS_rustc := syntax native:rustllvm flate arena
DEPS_rustdoc := rustc native:sundown
DEPS_rustpkg := rustc
DEPS_flate := std native:miniz
DEPS_arena := std extra

TOOL_DEPS_compiletest := extra green rustuv
TOOL_DEPS_rustpkg := rustpkg green rustuv
Expand Down
13 changes: 10 additions & 3 deletions src/libextra/arena.rs → src/libarena/lib.rs
Expand Up @@ -15,10 +15,17 @@
//! of individual objects while the arena itself is still alive. The benefit
//! of an arena is very fast allocation; just a pointer bump.

#[crate_id = "arena#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[allow(missing_doc)];
#[feature(managed_boxes)];

use list::{List, Cons, Nil};
use list;
extern mod extra;

use extra::list::{List, Cons, Nil};
use extra::list;

use std::at_vec;
use std::cast::{transmute, transmute_mut, transmute_mut_region};
Expand Down Expand Up @@ -493,7 +500,7 @@ impl<T> Drop for TypedArena<T> {
#[cfg(test)]
mod test {
use super::{Arena, TypedArena};
use test::BenchHarness;
use extra::test::BenchHarness;

struct Point {
x: int,
Expand Down
1 change: 0 additions & 1 deletion src/libextra/lib.rs
Expand Up @@ -70,7 +70,6 @@ pub mod tempfile;
pub mod glob;
pub mod term;
pub mod time;
pub mod arena;
pub mod base64;
pub mod workcache;
pub mod enum_set;
Expand Down
1 change: 1 addition & 0 deletions src/librustc/lib.rs
Expand Up @@ -31,6 +31,7 @@ This API is completely unstable and subject to change.

extern mod extra;
extern mod flate;
extern mod arena;
extern mod syntax;

use back::link;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/base.rs
Expand Up @@ -68,7 +68,7 @@ use util::common::indenter;
use util::ppaux::{Repr, ty_to_str};
use util::sha2::Sha256;

use extra::arena::TypedArena;
use arena::TypedArena;
use extra::time;
use std::c_str::ToCStr;
use std::cell::{Cell, RefCell};
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/middle/trans/common.rs
Expand Up @@ -31,7 +31,7 @@ use middle::typeck;
use util::ppaux::Repr;


use extra::arena::TypedArena;
use arena::TypedArena;
use std::c_str::ToCStr;
use std::cast::transmute;
use std::cast;
Expand Down
4 changes: 2 additions & 2 deletions src/librustc/middle/typeck/variance.rs
Expand Up @@ -193,8 +193,8 @@ represents the "variance transform" as defined in the paper:
*/

use std::hashmap::HashMap;
use extra::arena;
use extra::arena::Arena;
use arena;
use arena::Arena;
use middle::ty;
use std::vec;
use syntax::ast;
Expand Down
3 changes: 2 additions & 1 deletion src/test/bench/shootout-binarytrees.rs
Expand Up @@ -9,10 +9,11 @@
// except according to those terms.

extern mod extra;
extern mod arena;

use std::iter::range_step;
use extra::future::Future;
use extra::arena::TypedArena;
use arena::TypedArena;

enum Tree<'a> {
Nil,
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass/placement-new-arena.rs
Expand Up @@ -10,8 +10,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

extern mod extra;
use extra::arena::Arena;
extern mod arena;
use arena::Arena;

pub fn main() {
let mut arena = Arena::new();
Expand Down
5 changes: 2 additions & 3 deletions src/test/run-pass/regions-mock-tcx.rs
Expand Up @@ -16,10 +16,9 @@
// - Multiple lifetime parameters
// - Arenas

extern mod extra;
extern mod arena;

use extra::arena;
use extra::arena::Arena;
use arena::Arena;
use std::hashmap::HashMap;
use std::cast;
use std::libc;
Expand Down

0 comments on commit 4d0d3da

Please sign in to comment.