Skip to content

Commit a0f01c3

Browse files
committedJun 22, 2024
Auto merge of #126838 - matthiaskrgr:rollup-qkop22o, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #126140 (Rename `std::fs::try_exists` to `std::fs::exists` and stabilize fs_try_exists) - #126318 (Add a `x perf` command for integrating bootstrap with `rustc-perf`) - #126552 (Remove use of const traits (and `feature(effects)`) from stdlib) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f944afe + dc9a08f commit a0f01c3

File tree

181 files changed

+2256
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+2256
-337
lines changed
 

‎compiler/rustc_feature/src/unstable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ declare_features! (
449449
/// Allows `dyn* Trait` objects.
450450
(incomplete, dyn_star, "1.65.0", Some(102425)),
451451
/// Uses generic effect parameters for ~const bounds
452-
(unstable, effects, "1.72.0", Some(102090)),
452+
(incomplete, effects, "1.72.0", Some(102090)),
453453
/// Allows exhaustive pattern matching on types that contain uninhabited types.
454454
(unstable, exhaustive_patterns, "1.13.0", Some(51085)),
455455
/// Allows explicit tail calls via `become` expression.

‎compiler/rustc_hir_analysis/src/check/intrinsic.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -429,17 +429,17 @@ pub fn check_intrinsic_type(
429429

430430
sym::ptr_guaranteed_cmp => (
431431
1,
432-
1,
432+
0,
433433
vec![Ty::new_imm_ptr(tcx, param(0)), Ty::new_imm_ptr(tcx, param(0))],
434434
tcx.types.u8,
435435
),
436436

437437
sym::const_allocate => {
438-
(0, 1, vec![tcx.types.usize, tcx.types.usize], Ty::new_mut_ptr(tcx, tcx.types.u8))
438+
(0, 0, vec![tcx.types.usize, tcx.types.usize], Ty::new_mut_ptr(tcx, tcx.types.u8))
439439
}
440440
sym::const_deallocate => (
441441
0,
442-
1,
442+
0,
443443
vec![Ty::new_mut_ptr(tcx, tcx.types.u8), tcx.types.usize, tcx.types.usize],
444444
tcx.types.unit,
445445
),
@@ -478,16 +478,16 @@ pub fn check_intrinsic_type(
478478
| sym::frem_algebraic => (1, 0, vec![param(0), param(0)], param(0)),
479479
sym::float_to_int_unchecked => (2, 0, vec![param(0)], param(1)),
480480

481-
sym::assume => (0, 1, vec![tcx.types.bool], tcx.types.unit),
482-
sym::likely => (0, 1, vec![tcx.types.bool], tcx.types.bool),
483-
sym::unlikely => (0, 1, vec![tcx.types.bool], tcx.types.bool),
481+
sym::assume => (0, 0, vec![tcx.types.bool], tcx.types.unit),
482+
sym::likely => (0, 0, vec![tcx.types.bool], tcx.types.bool),
483+
sym::unlikely => (0, 0, vec![tcx.types.bool], tcx.types.bool),
484484

485485
sym::read_via_copy => (1, 0, vec![Ty::new_imm_ptr(tcx, param(0))], param(0)),
486486
sym::write_via_move => {
487487
(1, 0, vec![Ty::new_mut_ptr(tcx, param(0)), param(0)], tcx.types.unit)
488488
}
489489

490-
sym::typed_swap => (1, 1, vec![Ty::new_mut_ptr(tcx, param(0)); 2], tcx.types.unit),
490+
sym::typed_swap => (1, 0, vec![Ty::new_mut_ptr(tcx, param(0)); 2], tcx.types.unit),
491491

492492
sym::discriminant_value => {
493493
let assoc_items = tcx.associated_item_def_ids(
@@ -566,20 +566,20 @@ pub fn check_intrinsic_type(
566566

567567
sym::black_box => (1, 0, vec![param(0)], param(0)),
568568

569-
sym::is_val_statically_known => (1, 1, vec![param(0)], tcx.types.bool),
569+
sym::is_val_statically_known => (1, 0, vec![param(0)], tcx.types.bool),
570570

571-
sym::const_eval_select => (4, 1, vec![param(0), param(1), param(2)], param(3)),
571+
sym::const_eval_select => (4, 0, vec![param(0), param(1), param(2)], param(3)),
572572

573573
sym::vtable_size | sym::vtable_align => {
574574
(0, 0, vec![Ty::new_imm_ptr(tcx, tcx.types.unit)], tcx.types.usize)
575575
}
576576

577577
// This type check is not particularly useful, but the `where` bounds
578578
// on the definition in `core` do the heavy lifting for checking it.
579-
sym::aggregate_raw_ptr => (3, 1, vec![param(1), param(2)], param(0)),
580-
sym::ptr_metadata => (2, 1, vec![Ty::new_imm_ptr(tcx, param(0))], param(1)),
579+
sym::aggregate_raw_ptr => (3, 0, vec![param(1), param(2)], param(0)),
580+
sym::ptr_metadata => (2, 0, vec![Ty::new_imm_ptr(tcx, param(0))], param(1)),
581581

582-
sym::ub_checks => (0, 1, Vec::new(), tcx.types.bool),
582+
sym::ub_checks => (0, 0, Vec::new(), tcx.types.bool),
583583

584584
sym::simd_eq
585585
| sym::simd_ne

0 commit comments

Comments
 (0)