diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2014-01-12 02:25:51 +0200 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2014-01-12 02:26:04 +0200 |
| commit | 509fc92a9bb6f9a251308476ebf4e76795df60bf (patch) | |
| tree | 06b6f708400f1c7ce8ece748232263d4af3d3a56 /src/libstd | |
| parent | 68ebe8141a9d469ed7a7081e7a4a9ff4c82fbff7 (diff) | |
| download | rust-509fc92a9bb6f9a251308476ebf4e76795df60bf.tar.gz rust-509fc92a9bb6f9a251308476ebf4e76795df60bf.zip | |
Removed remnants of `@mut` and `~mut` from comments and the type system.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/extensions.rs | 6 | ||||
| -rw-r--r-- | src/libstd/local_data.rs | 3 | ||||
| -rw-r--r-- | src/libstd/vec.rs | 7 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs index 066dc883597..4e6f64a31e6 100644 --- a/src/libstd/io/extensions.rs +++ b/src/libstd/io/extensions.rs @@ -370,13 +370,13 @@ mod test { count: 0, }; // FIXME (#7049): Figure out some other way to do this. - //let buf = @mut ~[8, 9]; + //let buf = RefCell::new(~[8, 9]); (|| { - //reader.push_bytes(&mut *buf, 4); + //reader.push_bytes(buf.borrow_mut().get(), 4); }).finally(|| { // NB: Using rtassert here to trigger abort on failure since this is a should_fail test // FIXME: #7049 This fails because buf is still borrowed - //rtassert!(*buf == ~[8, 9, 10]); + //rtassert!(buf.borrow().get() == ~[8, 9, 10]); }) } diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index 95fdce99ea6..159337bf503 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -187,8 +187,7 @@ pub fn get<T: 'static, U>(key: Key<T>, f: |Option<&T>| -> U) -> U { /// if the key provided is not present in TLS currently. /// /// It is considered a runtime error to attempt to get a value which is already -/// on loan via this or the `get` methods. This is similar to how it's a runtime -/// error to take two mutable loans on an `@mut` box. +/// on loan via this or the `get` methods. pub fn get_mut<T: 'static, U>(key: Key<T>, f: |Option<&mut T>| -> U) -> U { get_with(key, MutLoan, |x| { match x { diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 257a1e6340f..61e78b68adc 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1837,11 +1837,8 @@ impl<T:Eq> OwnedEqVector<T> for ~[T] { fn dedup(&mut self) { unsafe { // Although we have a mutable reference to `self`, we cannot make - // *arbitrary* changes. There exists the possibility that this - // vector is contained with an `@mut` box and hence is still - // readable by the outside world during the `Eq` comparisons. - // Moreover, those comparisons could fail, so we must ensure - // that the vector is in a valid state at all time. + // *arbitrary* changes. The `Eq` comparisons could fail, so we + // must ensure that the vector is in a valid state at all time. // // The way that we handle this is by using swaps; we iterate // over all the elements, swapping as we go so that at the end |
