File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
branches/beta/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 @@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
31
31
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
32
32
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
33
33
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34
- refs/heads/beta: 52b5150cfd3dfcdf518675e9073f03e061a63a53
34
+ refs/heads/beta: 7412d1b2eff1c77241c54fa39508e7049d71ec7e
35
35
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
36
36
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37
37
refs/heads/tmp: c65fb1a81e5dc58cf171cc47f65de9e6e2119247
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