Skip to content

Refactor collections::list #12348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Feb 28, 2014
Merged

Refactor collections::list #12348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4c553af
Replaced @List with ~List in Rust's recursive example
brunoabinader Feb 15, 2014
1e6151a
Renamed variables
brunoabinader Feb 14, 2014
8846970
Implement Eq for Cell<T>
brunoabinader Feb 25, 2014
2b36276
Modified list::from_vec() to return List<T>
brunoabinader Feb 25, 2014
52524bf
Implemented Items<'a, T> for List<T>
brunoabinader Feb 25, 2014
0c8731e
Replaced list::each with iter() in Arenas's Drop impl
brunoabinader Feb 25, 2014
43bc6fc
Replaced list::each with iter() in get_region
brunoabinader Feb 25, 2014
a09a4b8
Removed list::foldl() in favor of iter().fold()
brunoabinader Feb 25, 2014
d681907
Removed list::find() in favor of iter().find()
brunoabinader Feb 25, 2014
197116d
Removed list::any() in favor of iter().any()
brunoabinader Feb 25, 2014
e589fcf
Implemented list::len() based on Container trait
brunoabinader Feb 25, 2014
a14d72d
Implemented list::is_empty() based on Container trait
brunoabinader Feb 25, 2014
223f309
Removed deprecated list::{iter,each}() functions
brunoabinader Feb 25, 2014
45fd63a
Replaced list::has() with list::contains()
brunoabinader Feb 25, 2014
fed034c
Refactored list::head() to be based on List<T>
brunoabinader Feb 25, 2014
65f1993
Refactored list::tail() to be based on List<T>
brunoabinader Feb 25, 2014
1c27c90
Refactored list::append() to be based on List<T>
brunoabinader Feb 25, 2014
4da6d04
Replaced list::push() with unshift() based on List<T>
brunoabinader Feb 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/doc/rust.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3256,10 +3256,10 @@ An example of a *recursive* type and its use:
~~~~
enum List<T> {
Nil,
Cons(T, @List<T>)
Cons(T, ~List<T>)
}

let a: List<int> = Cons(7, @Cons(13, @Nil));
let a: List<int> = Cons(7, ~Cons(13, ~Nil));
Copy link
Member

Choose a reason for hiding this comment

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

Why change this part of the tutorial?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As @eddyb mentioned on #servo, it would be nice to replace @List<T> with some other kind of garbage-collected container (like Rc<T>), but it wouldn't need to mess with the tutorial.

ps: However, I was told that @ is going to be deprecated soon, so we may change it later on anyways.

~~~~

### Pointer types
Expand Down
9 changes: 3 additions & 6 deletions src/libarena/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
extern crate collections;

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

use std::cast::{transmute, transmute_mut, transmute_mut_region};
use std::cast;
Expand All @@ -44,7 +43,7 @@ use std::vec;
// The way arena uses arrays is really deeply awful. The arrays are
// allocated, and have capacities reserved, but the fill for the array
// will always stay at 0.
#[deriving(Clone)]
#[deriving(Clone, Eq)]
struct Chunk {
data: Rc<RefCell<~[u8]>>,
fill: Cell<uint>,
Expand Down Expand Up @@ -119,13 +118,11 @@ impl Drop for Arena {
fn drop(&mut self) {
unsafe {
destroy_chunk(&self.head);

list::each(self.chunks.get(), |chunk| {
for chunk in self.chunks.get().iter() {
if !chunk.is_pod.get() {
destroy_chunk(chunk);
}
true
});
}
}
}
}
Expand Down
Loading