@@ -1246,7 +1246,7 @@ fn default_configuration(sess: &Session) -> Cfg {
1246
1246
// NOTE: This should be kept in sync with `CheckCfg::fill_well_known` below.
1247
1247
let end = & sess. target . endian ;
1248
1248
let arch = & sess. target . arch ;
1249
- let wordsz = sess. target . pointer_width . to_string ( ) ;
1249
+ let wordsz = sess. target . pointer_width as u64 ;
1250
1250
let os = & sess. target . os ;
1251
1251
let env = & sess. target . env ;
1252
1252
let abi = & sess. target . abi ;
@@ -1273,7 +1273,7 @@ fn default_configuration(sess: &Session) -> Cfg {
1273
1273
}
1274
1274
ret. insert ( ( sym:: target_arch, Some ( Symbol :: intern ( arch) ) ) ) ;
1275
1275
ret. insert ( ( sym:: target_endian, Some ( Symbol :: intern ( end. as_str ( ) ) ) ) ) ;
1276
- ret. insert ( ( sym:: target_pointer_width, Some ( Symbol :: intern ( & wordsz) ) ) ) ;
1276
+ ret. insert ( ( sym:: target_pointer_width, Some ( sym :: integer ( wordsz) ) ) ) ;
1277
1277
ret. insert ( ( sym:: target_env, Some ( Symbol :: intern ( env) ) ) ) ;
1278
1278
ret. insert ( ( sym:: target_abi, Some ( Symbol :: intern ( abi) ) ) ) ;
1279
1279
if sess. is_nightly_build ( ) {
@@ -1293,19 +1293,18 @@ fn default_configuration(sess: &Session) -> Cfg {
1293
1293
] {
1294
1294
if i >= min_atomic_width && i <= max_atomic_width {
1295
1295
has_atomic = true ;
1296
- let mut insert_atomic = |s , align : Align | {
1297
- ret. insert ( ( sym:: target_has_atomic_load_store, Some ( Symbol :: intern ( s ) ) ) ) ;
1296
+ let mut insert_atomic = |sym , align : Align | {
1297
+ ret. insert ( ( sym:: target_has_atomic_load_store, Some ( sym ) ) ) ;
1298
1298
if atomic_cas {
1299
- ret. insert ( ( sym:: target_has_atomic, Some ( Symbol :: intern ( s ) ) ) ) ;
1299
+ ret. insert ( ( sym:: target_has_atomic, Some ( sym ) ) ) ;
1300
1300
}
1301
1301
if align. bits ( ) == i {
1302
- ret. insert ( ( sym:: target_has_atomic_equal_alignment, Some ( Symbol :: intern ( s ) ) ) ) ;
1302
+ ret. insert ( ( sym:: target_has_atomic_equal_alignment, Some ( sym ) ) ) ;
1303
1303
}
1304
1304
} ;
1305
- let s = i. to_string ( ) ;
1306
- insert_atomic ( & s, align) ;
1307
- if s == wordsz {
1308
- insert_atomic ( "ptr" , layout. pointer_align . abi ) ;
1305
+ insert_atomic ( sym:: integer ( i) , align) ;
1306
+ if wordsz == i {
1307
+ insert_atomic ( sym:: ptr, layout. pointer_align . abi ) ;
1309
1308
}
1310
1309
}
1311
1310
}
0 commit comments