Skip to content

Commit 717a2e0

Browse files
omasanorialexcrichton
authored andcommitted
---
yaml --- r: 126012 b: refs/heads/try c: 02d12e5 h: refs/heads/master v: v3
1 parent ac509a1 commit 717a2e0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
5-
refs/heads/try: 04fa9066480d172ffd4b6d02f9edf5b3d31fef56
5+
refs/heads/try: 02d12e5f71ac37374684439f2f9c36f38b72f63a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/liballoc/arc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<T: Share + Send> Arc<T> {
9292
}
9393

9494
#[inline]
95-
fn inner<'a>(&'a self) -> &'a ArcInner<T> {
95+
fn inner(&self) -> &ArcInner<T> {
9696
// This unsafety is ok because while this arc is alive we're guaranteed
9797
// that the inner pointer is valid. Furthermore, we know that the
9898
// `ArcInner` structure itself is `Share` because the inner data is
@@ -142,7 +142,7 @@ impl<T: Share + Send> Clone for Arc<T> {
142142
#[experimental = "Deref is experimental."]
143143
impl<T: Send + Share> Deref<T> for Arc<T> {
144144
#[inline]
145-
fn deref<'a>(&'a self) -> &'a T {
145+
fn deref(&self) -> &T {
146146
&self.inner().data
147147
}
148148
}
@@ -155,7 +155,7 @@ impl<T: Send + Share + Clone> Arc<T> {
155155
/// data is cloned if the reference count is greater than one.
156156
#[inline]
157157
#[experimental]
158-
pub fn make_unique<'a>(&'a mut self) -> &'a mut T {
158+
pub fn make_unique(&mut self) -> &mut T {
159159
// Note that we hold a strong reference, which also counts as
160160
// a weak reference, so we only clone if there is an
161161
// additional reference of either kind.
@@ -238,7 +238,7 @@ impl<T: Share + Send> Weak<T> {
238238
}
239239

240240
#[inline]
241-
fn inner<'a>(&'a self) -> &'a ArcInner<T> {
241+
fn inner(&self) -> &ArcInner<T> {
242242
// See comments above for why this is "safe"
243243
unsafe { &*self._ptr }
244244
}

0 commit comments

Comments
 (0)