1
1
use alloc_wg:: {
2
+ alloc:: Global ,
2
3
boxed:: Box ,
3
4
collections:: CollectionAllocErr :: * ,
4
5
vec,
@@ -1125,7 +1126,7 @@ fn test_try_reserve() {
1125
1126
1126
1127
{
1127
1128
// Note: basic stuff is checked by test_reserve
1128
- let mut empty_bytes: Vec < u8 , _ > = Vec :: new ( ) ;
1129
+ let mut empty_bytes: Vec < u8 , _ > = Vec :: new_in ( Global ) ;
1129
1130
1130
1131
// Check isize::MAX doesn't count as an overflow
1131
1132
if let Err ( CapacityOverflow ) = empty_bytes. try_reserve ( MAX_CAP ) {
@@ -1163,7 +1164,8 @@ fn test_try_reserve() {
1163
1164
1164
1165
{
1165
1166
// Same basic idea, but with non-zero len
1166
- let mut ten_bytes: Vec < u8 > = vec ! [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ] ;
1167
+ let mut ten_bytes: Vec < u8 , _ > = vec ! [ try in Global ; 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ]
1168
+ . expect ( "Unable to allocate ten bytes" ) ;
1167
1169
1168
1170
if let Err ( CapacityOverflow ) = ten_bytes. try_reserve ( MAX_CAP - 10 ) {
1169
1171
panic ! ( "isize::MAX shouldn't trigger an overflow!" ) ;
@@ -1188,7 +1190,8 @@ fn test_try_reserve() {
1188
1190
1189
1191
{
1190
1192
// Same basic idea, but with interesting type size
1191
- let mut ten_u32s: Vec < u32 > = vec ! [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ] ;
1193
+ let mut ten_u32s: Vec < u32 , _ > = vec ! [ try in Global ; 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ]
1194
+ . expect ( "Unable to allocate 40 bytes" ) ;
1192
1195
1193
1196
if let Err ( CapacityOverflow ) = ten_u32s. try_reserve ( MAX_CAP / 4 - 10 ) {
1194
1197
panic ! ( "isize::MAX shouldn't trigger an overflow!" ) ;
@@ -1225,7 +1228,7 @@ fn test_try_reserve_exact() {
1225
1228
let guards_against_isize = size_of :: < usize > ( ) < 8 ;
1226
1229
1227
1230
{
1228
- let mut empty_bytes: Vec < u8 > = Vec :: new ( ) ;
1231
+ let mut empty_bytes: Vec < u8 , _ > = Vec :: new_in ( Global ) ;
1229
1232
1230
1233
if let Err ( CapacityOverflow ) = empty_bytes. try_reserve_exact ( MAX_CAP ) {
1231
1234
panic ! ( "isize::MAX shouldn't trigger an overflow!" ) ;
@@ -1256,7 +1259,8 @@ fn test_try_reserve_exact() {
1256
1259
}
1257
1260
1258
1261
{
1259
- let mut ten_bytes: Vec < u8 > = vec ! [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ] ;
1262
+ let mut ten_bytes: Vec < u8 , _ > = vec ! [ try in Global ; 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ]
1263
+ . expect ( "Unable to allocate ten bytes" ) ;
1260
1264
1261
1265
if let Err ( CapacityOverflow ) = ten_bytes. try_reserve_exact ( MAX_CAP - 10 ) {
1262
1266
panic ! ( "isize::MAX shouldn't trigger an overflow!" ) ;
@@ -1279,7 +1283,8 @@ fn test_try_reserve_exact() {
1279
1283
}
1280
1284
1281
1285
{
1282
- let mut ten_u32s: Vec < u32 > = vec ! [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ] ;
1286
+ let mut ten_u32s: Vec < u32 , _ > = vec ! [ try in Global ; 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ]
1287
+ . expect ( "Unable to allocate 40 bytes" ) ;
1283
1288
1284
1289
if let Err ( CapacityOverflow ) = ten_u32s. try_reserve_exact ( MAX_CAP / 4 - 10 ) {
1285
1290
panic ! ( "isize::MAX shouldn't trigger an overflow!" ) ;
0 commit comments