FIX - Rebase conflict

JhonnyBillM · JhonnyBillM · commit 994434fa3993 · 2022-09-09T09:23:49.000-04:00
diff --git a/compiler/rustc_ast_lowering/src/errors.rs b/compiler/rustc_ast_lowering/src/errors.rs
@@ -335,7 +335,7 @@ pub struct InclusiveRangeWithNoEnd {
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic, Clone, Copy)]
+#[derive(Diagnostic, Clone, Copy)]
 #[diag(ast_lowering::trait_fn_async, code = "E0706")]
 #[note]
 #[note(ast_lowering::note2)]

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ pub struct InclusiveRangeWithNoEnd {`
`335`	`335`	`pub span: Span,`
`336`	`336`	`}`
`337`	`337`
`338`		`-#[derive(SessionDiagnostic, Clone, Copy)]`
	`338`	`+#[derive(Diagnostic, Clone, Copy)]`
`339`	`339`	`#[diag(ast_lowering::trait_fn_async, code = "E0706")]`
`340`	`340`	`#[note]`
`341`	`341`	`#[note(ast_lowering::note2)]`