Skip to content

Commit cd510b3

Browse files
committed
std: Remove the get() method from RefCell wrappers
This method has been entirely obsoleted by autoderef, so there's no reason for its existence.
1 parent e233a43 commit cd510b3

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

src/libstd/cell.rs

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ impl<T> RefCell<T> {
176176
/// Fails if the value is currently borrowed.
177177
#[inline]
178178
pub fn set(&self, value: T) {
179-
let mut reference = self.borrow_mut();
180-
*reference.get() = value;
179+
*self.borrow_mut() = value;
181180
}
182181
}
183182

@@ -189,23 +188,19 @@ impl<T:Clone> RefCell<T> {
189188
/// Fails if the value is currently mutably borrowed.
190189
#[inline]
191190
pub fn get(&self) -> T {
192-
let reference = self.borrow();
193-
(*reference.get()).clone()
191+
(*self.borrow()).clone()
194192
}
195193
}
196194

197195
impl<T: Clone> Clone for RefCell<T> {
198196
fn clone(&self) -> RefCell<T> {
199-
let x = self.borrow();
200-
RefCell::new(x.get().clone())
197+
RefCell::new(self.get())
201198
}
202199
}
203200

204201
impl<T: Eq> Eq for RefCell<T> {
205202
fn eq(&self, other: &RefCell<T>) -> bool {
206-
let a = self.borrow();
207-
let b = other.borrow();
208-
a.get() == b.get()
203+
*self.borrow() == *other.borrow()
209204
}
210205
}
211206

@@ -222,14 +217,6 @@ impl<'b, T> Drop for Ref<'b, T> {
222217
}
223218
}
224219

225-
impl<'b, T> Ref<'b, T> {
226-
/// Retrieve an immutable reference to the stored value.
227-
#[inline]
228-
pub fn get<'a>(&'a self) -> &'a T {
229-
unsafe{ &*self.parent.value.get() }
230-
}
231-
}
232-
233220
impl<'b, T> Deref<T> for Ref<'b, T> {
234221
#[inline]
235222
fn deref<'a>(&'a self) -> &'a T {
@@ -250,14 +237,6 @@ impl<'b, T> Drop for RefMut<'b, T> {
250237
}
251238
}
252239

253-
impl<'b, T> RefMut<'b, T> {
254-
/// Retrieve a mutable reference to the stored value.
255-
#[inline]
256-
pub fn get<'a>(&'a mut self) -> &'a mut T {
257-
unsafe{ &mut *self.parent.value.get() }
258-
}
259-
}
260-
261240
impl<'b, T> Deref<T> for RefMut<'b, T> {
262241
#[inline]
263242
fn deref<'a>(&'a self) -> &'a T {

src/libstd/rc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ mod tests {
284284

285285
let a = Rc::new(Cycle { x: RefCell::new(None) });
286286
let b = a.clone().downgrade();
287-
*a.deref().x.borrow_mut().get() = Some(b);
287+
*a.deref().x.borrow_mut() = Some(b);
288288

289289
// hopefully we don't double-free (or leak)...
290290
}

src/libstd/rt/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ mod test {
471471
472472
{
473473
let mut a = a.borrow_mut();
474-
a.get().next = Some(b);
474+
a.next = Some(b);
475475
}
476476
}
477477

0 commit comments

Comments
 (0)