Skip to content

Commit

Permalink
rename Linear{Map,Set} => Hash{Map,Set}
Browse files Browse the repository at this point in the history
  • Loading branch information
thestinger committed Apr 3, 2013
1 parent 44029a5 commit cc148b5
Show file tree
Hide file tree
Showing 75 changed files with 523 additions and 523 deletions.
4 changes: 2 additions & 2 deletions doc/rust.md
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,10 @@ expression context, the final namespace qualifier is omitted.
Two examples of paths with type arguments:

~~~~
# use core::hashmap::LinearMap;
# use core::hashmap::HashMap;
# fn f() {
# fn id<T:Copy>(t: T) -> T { t }
type t = LinearMap<int,~str>; // Type arguments used in a type expression
type t = HashMap<int,~str>; // Type arguments used in a type expression
let x = id::<int>(10); // Type arguments used in a call expression
# }
~~~~
Expand Down
4 changes: 2 additions & 2 deletions doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -1888,8 +1888,8 @@ illegal to copy and pass by value.
Generic `type`, `struct`, and `enum` declarations follow the same pattern:

~~~~
# use core::hashmap::LinearMap;
type Set<T> = LinearMap<T, ()>;
# use core::hashmap::HashMap;
type Set<T> = HashMap<T, ()>;
struct Stack<T> {
elements: ~[T]
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/gc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ use io;
use libc::{size_t, uintptr_t};
use option::{None, Option, Some};
use ptr;
use hashmap::LinearSet;
use hashmap::HashSet;
use stackwalk;
use sys;

Expand Down Expand Up @@ -344,7 +344,7 @@ pub fn cleanup_stack_for_failure() {
ptr::null()
};

let mut roots = LinearSet::new();
let mut roots = HashSet::new();
for walk_gc_roots(need_cleanup, sentinel) |root, tydesc| {
// Track roots to avoid double frees.
if roots.contains(&*root) {
Expand Down
Loading

9 comments on commit cc148b5

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

merging thestinger/rust/hashmap = cc148b5 into auto

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

thestinger/rust/hashmap = cc148b5 merged ok, testing candidate = ba83cba5

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

merging thestinger/rust/hashmap = cc148b5 into auto

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

thestinger/rust/hashmap = cc148b5 merged ok, testing candidate = 5b933ae

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on cc148b5 Apr 3, 2013

Choose a reason for hiding this comment

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

fast-forwarding incoming to auto = 5b933ae

Please sign in to comment.