Skip to content

Commit

Permalink
std and green: fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Mar 28, 2014
1 parent e0e8e95 commit 63b233c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/libgreen/sched.rs
Expand Up @@ -1473,7 +1473,7 @@ mod test {
let mut handle = pool.spawn_sched();
handle.send(PinnedTask(pool.task(TaskOpts::new(), proc() {
unsafe {
let mut guard = LOCK.lock();
let guard = LOCK.lock();

start_tx.send(());
guard.wait(); // block the scheduler thread
Expand Down Expand Up @@ -1509,7 +1509,7 @@ mod test {
child_tx.send(20);
pingpong(&parent_rx, &child_tx);
unsafe {
let mut guard = LOCK.lock();
let guard = LOCK.lock();
guard.signal(); // wakeup waiting scheduler
guard.wait(); // wait for them to grab the lock
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/iter.rs
Expand Up @@ -2335,7 +2335,7 @@ mod tests {

#[test]
fn test_counter_from_iter() {
let mut it = count(0, 5).take(10);
let it = count(0, 5).take(10);
let xs: ~[int] = FromIterator::from_iterator(it);
assert_eq!(xs, ~[0, 5, 10, 15, 20, 25, 30, 35, 40, 45]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/str.rs
Expand Up @@ -3218,7 +3218,7 @@ mod tests {
let data = ~"ประเทศไทย中";
let mut cpy = data.clone();
let other = "abc";
let mut it = other.chars();
let it = other.chars();
cpy.extend(it);
assert_eq!(cpy, data + other);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/unstable/mutex.rs
Expand Up @@ -621,7 +621,7 @@ mod test {
#[test]
fn destroy_immediately() {
unsafe {
let mut m = StaticNativeMutex::new();
let m = StaticNativeMutex::new();
m.destroy();
}
}
Expand Down

9 comments on commit 63b233c

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at erickt@63b233c

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

Choose a reason for hiding this comment

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

merging erickt/rust/remove-list = 63b233c into auto

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

Choose a reason for hiding this comment

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

erickt/rust/remove-list = 63b233c merged ok, testing candidate = de2127ff

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at erickt@63b233c

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

Choose a reason for hiding this comment

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

merging erickt/rust/remove-list = 63b233c into auto

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

Choose a reason for hiding this comment

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

erickt/rust/remove-list = 63b233c merged ok, testing candidate = d878df0

@bors
Copy link
Contributor

@bors bors commented on 63b233c Mar 29, 2014

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 63b233c Mar 29, 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 = d878df0

Please sign in to comment.