forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#101479 - Dylan-DPC:rollup-v8ite0y, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#100658 (TyCtxt::get_attr should check that no duplicates are allowed) - rust-lang#101021 (Migrate ``rustc_middle`` diagnostic) - rust-lang#101287 (Document eager evaluation of `bool::then_some` argument) - rust-lang#101412 (Some more cleanup in `core`) - rust-lang#101427 (Fix ICE, generalize 'move generics to trait' suggestion for >0 non-rcvr arguments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
21 changed files
with
245 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
middle_drop_check_overflow = | ||
overflow while adding drop-check rules for {$ty} | ||
.note = overflowed on {$overflow_ty} | ||
middle_opaque_hidden_type_mismatch = | ||
concrete type differs from previous defining opaque type use | ||
.label = expected `{$self_ty}`, got `{$other_ty}` | ||
middle_conflict_types = | ||
this expression supplies two conflicting concrete types for the same opaque type | ||
middle_previous_use_here = | ||
previous use here | ||
middle_limit_invalid = | ||
`limit` must be a non-negative integer | ||
.label = {$error_str} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
use rustc_macros::SessionDiagnostic; | ||
use rustc_span::Span; | ||
|
||
use crate::ty::Ty; | ||
|
||
#[derive(SessionDiagnostic)] | ||
#[diag(middle::drop_check_overflow, code = "E0320")] | ||
#[note] | ||
pub struct DropCheckOverflow<'tcx> { | ||
#[primary_span] | ||
pub span: Span, | ||
pub ty: Ty<'tcx>, | ||
pub overflow_ty: Ty<'tcx>, | ||
} | ||
|
||
#[derive(SessionDiagnostic)] | ||
#[diag(middle::opaque_hidden_type_mismatch)] | ||
pub struct OpaqueHiddenTypeMismatch<'tcx> { | ||
pub self_ty: Ty<'tcx>, | ||
pub other_ty: Ty<'tcx>, | ||
#[primary_span] | ||
#[label] | ||
pub other_span: Span, | ||
#[subdiagnostic] | ||
pub sub: TypeMismatchReason, | ||
} | ||
|
||
#[derive(SessionSubdiagnostic)] | ||
pub enum TypeMismatchReason { | ||
#[label(middle::conflict_types)] | ||
ConflictType { | ||
#[primary_span] | ||
span: Span, | ||
}, | ||
#[note(middle::previous_use_here)] | ||
PreviousUse { | ||
#[primary_span] | ||
span: Span, | ||
}, | ||
} | ||
|
||
#[derive(SessionDiagnostic)] | ||
#[diag(middle::limit_invalid)] | ||
pub struct LimitInvalid<'a> { | ||
#[primary_span] | ||
pub span: Span, | ||
#[label] | ||
pub value_span: Span, | ||
pub error_str: &'a str, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.