File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
branches/try/src/libcollections Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
3
3
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4
- refs/heads/try: 32b7b50bafd0d40fda1caa93cf7f7068cc5052e3
4
+ refs/heads/try: 688b62382c3eeeb0086eb4ada8ad25b08883960e
5
5
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
6
6
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
7
7
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -1482,7 +1482,7 @@ impl<T> FromIterator<T> for Vec<T> {
1482
1482
None => return Vec :: new ( ) ,
1483
1483
Some ( element) => {
1484
1484
let ( lower, _) = iterator. size_hint ( ) ;
1485
- let mut vector = Vec :: with_capacity ( 1 + lower) ;
1485
+ let mut vector = Vec :: with_capacity ( lower. saturating_add ( 1 ) ) ;
1486
1486
unsafe {
1487
1487
ptr:: write ( vector. get_unchecked_mut ( 0 ) , element) ;
1488
1488
vector. set_len ( 1 ) ;
@@ -1570,10 +1570,11 @@ impl<T> Vec<T> {
1570
1570
let len = self . len ( ) ;
1571
1571
if len == self . capacity ( ) {
1572
1572
let ( lower, _) = iterator. size_hint ( ) ;
1573
- self . reserve ( lower + 1 ) ;
1573
+ self . reserve ( lower. saturating_add ( 1 ) ) ;
1574
1574
}
1575
1575
unsafe {
1576
1576
ptr:: write ( self . get_unchecked_mut ( len) , element) ;
1577
+ // NB can't overflow since we would have had to alloc the address space
1577
1578
self . set_len ( len + 1 ) ;
1578
1579
}
1579
1580
}
You can’t perform that action at this time.
0 commit comments