Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d571ae8

Browse files
committedAug 31, 2024
Auto merge of #129817 - matthiaskrgr:rollup-ll2ld5m, r=matthiaskrgr
Rollup of 12 pull requests Successful merges: - #129659 (const fn stability checking: also check declared language features) - #129711 (Expand NLL MIR dumps) - #129730 (f32 docs: define 'arithmetic' operations) - #129733 (Subtree update of `rust-analyzer`) - #129749 (llvm-wrapper: adapt for LLVM API changes) - #129757 (Add a test for trait solver overflow in MIR inliner cycle detection) - #129760 (Make the "detect-old-time" UI test more representative) - #129767 (Remove `#[macro_use] extern crate tracing`, round 4) - #129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt) - #129785 (Miri subtree update) - #129791 (mark joboet as on vacation) - #129812 (interpret, codegen: tweak some comments and checks regarding Box with custom allocator) Failed merges: - #129777 (Add `unreachable_pub`, round 4) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9649706 + 830b1de commit d571ae8

File tree

655 files changed

+11015
-3490
lines changed

Some content is hidden

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

655 files changed

+11015
-3490
lines changed
 

‎compiler/rustc_borrowck/src/type_check/constraint_conversion.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use rustc_span::Span;
1313
use rustc_trait_selection::traits::query::type_op::custom::CustomTypeOp;
1414
use rustc_trait_selection::traits::query::type_op::{TypeOp, TypeOpOutput};
1515
use rustc_trait_selection::traits::ScrubbedTraitError;
16+
use tracing::{debug, instrument};
1617

1718
use crate::constraints::OutlivesConstraint;
1819
use crate::region_infer::TypeTest;

‎compiler/rustc_borrowck/src/type_check/free_region_relations.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use rustc_span::{ErrorGuaranteed, Span};
1515
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
1616
use rustc_trait_selection::solve::deeply_normalize;
1717
use rustc_trait_selection::traits::query::type_op::{self, TypeOp};
18+
use tracing::{debug, instrument};
1819
use type_op::TypeOpOutput;
1920

2021
use crate::type_check::{constraint_conversion, Locations, MirTypeckRegionConstraints};
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.