Skip to content

Commit 3ab3681

Browse files
committed
---
yaml --- r: 82739 b: refs/heads/auto c: 3ae8953 h: refs/heads/master i: 82737: d77e240 82735: 6810e2b v: v3
1 parent 113d76c commit 3ab3681

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 6828d2e01860593a687f36397eb38dc338f092a9
16+
refs/heads/auto: 3ae895360c89b27bee7f076fded1c99691bd057e
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/vec.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -932,11 +932,11 @@ impl<'self,T> ImmutableVector<'self, T> for &'self [T] {
932932
if sys::size_of::<T>() == 0 {
933933
VecIterator{ptr: p,
934934
end: (p as uint + self.len()) as *T,
935-
lifetime: cast::transmute(p)}
935+
lifetime: None}
936936
} else {
937937
VecIterator{ptr: p,
938938
end: p.offset(self.len() as int),
939-
lifetime: cast::transmute(p)}
939+
lifetime: None}
940940
}
941941
}
942942
}
@@ -1940,11 +1940,11 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
19401940
if sys::size_of::<T>() == 0 {
19411941
VecMutIterator{ptr: p,
19421942
end: (p as uint + self.len()) as *mut T,
1943-
lifetime: cast::transmute(p)}
1943+
lifetime: None}
19441944
} else {
19451945
VecMutIterator{ptr: p,
19461946
end: p.offset(self.len() as int),
1947-
lifetime: cast::transmute(p)}
1947+
lifetime: None}
19481948
}
19491949
}
19501950
}
@@ -2389,7 +2389,7 @@ impl<'self, T> RandomAccessIterator<&'self T> for VecIterator<'self, T> {
23892389
pub struct VecIterator<'self, T> {
23902390
priv ptr: *T,
23912391
priv end: *T,
2392-
priv lifetime: &'self T // FIXME: #5922
2392+
priv lifetime: Option<&'self ()> // FIXME: #5922
23932393
}
23942394
iterator!{impl VecIterator -> &'self T}
23952395
double_ended_iterator!{impl VecIterator -> &'self T}
@@ -2407,7 +2407,7 @@ impl<'self, T> Clone for VecIterator<'self, T> {
24072407
pub struct VecMutIterator<'self, T> {
24082408
priv ptr: *mut T,
24092409
priv end: *mut T,
2410-
priv lifetime: &'self mut T // FIXME: #5922
2410+
priv lifetime: Option<&'self mut ()> // FIXME: #5922
24112411
}
24122412
iterator!{impl VecMutIterator -> &'self mut T}
24132413
double_ended_iterator!{impl VecMutIterator -> &'self mut T}

0 commit comments

Comments
 (0)