File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
branches/auto/src/libcollections Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
10
10
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
11
11
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
12
12
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13
- refs/heads/auto: 52b5150cfd3dfcdf518675e9073f03e061a63a53
13
+ refs/heads/auto: 7412d1b2eff1c77241c54fa39508e7049d71ec7e
14
14
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
15
15
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
16
16
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
Original file line number Diff line number Diff line change @@ -56,6 +56,7 @@ use core::cmp::{Ordering};
56
56
use core:: default:: Default ;
57
57
use core:: fmt;
58
58
use core:: hash:: { self , Hash } ;
59
+ use core:: intrinsics:: assume;
59
60
use core:: iter:: { repeat, FromIterator , IntoIterator } ;
60
61
use core:: marker:: { self , ContravariantLifetime , InvariantType } ;
61
62
use core:: mem;
@@ -1587,8 +1588,12 @@ impl<T> AsSlice<T> for Vec<T> {
1587
1588
#[ stable( feature = "rust1" , since = "1.0.0" ) ]
1588
1589
fn as_slice ( & self ) -> & [ T ] {
1589
1590
unsafe {
1591
+ let p = * self . ptr ;
1592
+ if cfg ! ( not( stage0) ) { // NOTE remove cfg after next snapshot
1593
+ assume ( p != 0 as * mut T ) ;
1594
+ }
1590
1595
mem:: transmute ( RawSlice {
1591
- data : * self . ptr ,
1596
+ data : p ,
1592
1597
len : self . len
1593
1598
} )
1594
1599
}
You can’t perform that action at this time.
0 commit comments