Skip to content

Commit a9ef100

Browse files
committedOct 28, 2022
Auto merge of #103671 - matthiaskrgr:rollup-iuugpep, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #102642 (Add tests for static async functions in traits) - #103283 (Add suggestions for unsafe impl error codes) - #103523 (Fix unwanted merge of inline doc comments for impl blocks) - #103550 (diagnostics: do not suggest static candidates as traits to import) - #103641 (Don't carry MIR location in `ConstraintCategory::CallArgument`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
·
1.90.01.66.0
2 parents 898f463 + 84663ce commit a9ef100

File tree

62 files changed

+928
-114
lines changed

Some content is hidden

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

62 files changed

+928
-114
lines changed
 

‎compiler/rustc_borrowck/src/constraints/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub struct OutlivesConstraint<'tcx> {
9292
pub span: Span,
9393

9494
/// What caused this constraint?
95-
pub category: ConstraintCategory,
95+
pub category: ConstraintCategory<'tcx>,
9696

9797
/// Variance diagnostic information
9898
pub variance_info: VarianceDiagInfo<'tcx>,

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
983983
err: &mut Diagnostic,
984984
location: Location,
985985
issued_borrow: &BorrowData<'tcx>,
986-
explanation: BorrowExplanation,
986+
explanation: BorrowExplanation<'tcx>,
987987
) {
988988
let used_in_call = matches!(
989989
explanation,
@@ -1333,7 +1333,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
13331333
borrow: &BorrowData<'tcx>,
13341334
drop_span: Span,
13351335
borrow_spans: UseSpans<'tcx>,
1336-
explanation: BorrowExplanation,
1336+
explanation: BorrowExplanation<'tcx>,
13371337
) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
13381338
debug!(
13391339
"report_local_value_does_not_live_long_enough(\
@@ -1539,7 +1539,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
15391539
drop_span: Span,
15401540
borrow_spans: UseSpans<'tcx>,
15411541
proper_span: Span,
1542-
explanation: BorrowExplanation,
1542+
explanation: BorrowExplanation<'tcx>,
15431543
) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
15441544
if let BorrowExplanation::MustBeValidFor { category, span, from_closure: false, .. } =
15451545
explanation
@@ -1653,7 +1653,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
16531653
borrow: &BorrowData<'tcx>,
16541654
borrow_span: Span,
16551655
return_span: Span,
1656-
category: ConstraintCategory,
1656+
category: ConstraintCategory<'tcx>,
16571657
opt_place_desc: Option<&String>,
16581658
) -> Option<DiagnosticBuilder<'cx, ErrorGuaranteed>> {
16591659
let return_kind = match category {
@@ -1748,7 +1748,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
17481748
use_span: UseSpans<'tcx>,
17491749
var_span: Span,
17501750
fr_name: &RegionName,
1751-
category: ConstraintCategory,
1751+
category: ConstraintCategory<'tcx>,
17521752
constraint_span: Span,
17531753
captured_var: &str,
17541754
) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {

0 commit comments

Comments
 (0)
Please sign in to comment.