Auto merge of #8286 - eefriedman:no-move, r=nox

Remove unnecessary uses of #[no_move]

The patch makes RootCollection a bit safer by making the StackRootTLS hold
it in place.

RootedVec was doing an extremely delicate dance and just hoping nobody
messed it up; switch to a Box to be safe.

CodeGenRust seemed to be using no_move for no particularly good reason.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8286)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-08 12:51:00 +05:30
commit 92f9e58310
5 changed files with 25 additions and 24 deletions

View file

@ -90,6 +90,7 @@ use std::borrow::ToOwned;
use std::cell::{Cell, RefCell};
use std::collections::HashSet;
use std::io::{Write, stdout};
use std::marker::PhantomData;
use std::mem as std_mem;
use std::option::Option;
use std::ptr;
@ -367,18 +368,18 @@ impl TimerEventChan for MainThreadTimerEventChan {
}
}
pub struct StackRootTLS;
pub struct StackRootTLS<'a>(PhantomData<&'a u32>);
impl StackRootTLS {
pub fn new(roots: &RootCollection) -> StackRootTLS {
impl<'a> StackRootTLS<'a> {
pub fn new(roots: &'a RootCollection) -> StackRootTLS<'a> {
STACK_ROOTS.with(|ref r| {
r.set(Some(RootCollectionPtr(roots as *const _)))
});
StackRootTLS
StackRootTLS(PhantomData)
}
}
impl Drop for StackRootTLS {
impl<'a> Drop for StackRootTLS<'a> {
fn drop(&mut self) {
STACK_ROOTS.with(|ref r| r.set(None));
}