mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate derivable diagnostics in check_attr.rs

Browse Source
This commit is contained in:
rdvdev2 2022-09-02 04:54:42 +02:00 committed by Nathan Stocks
parent 17a4a68ab0
commit 0315d7c9db
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_error_messages/locales/en-US/passes.ftl
View File

@ -217,6 +217,8 @@ passes_debug_visualizer_invalid = invalid argument
.note_2 = OR .note_2 = OR
.note_3 = expected: `gdb_script_file = "..."` .note_3 = expected: `gdb_script_file = "..."`
passes_debug_visualizer_unreadable = couldn't read {$file}: {$error}
passes_rustc_allow_const_fn_unstable = attribute should be applied to `const fn` passes_rustc_allow_const_fn_unstable = attribute should be applied to `const fn`
.label = not a `const fn` .label = not a `const fn`

14
compiler/rustc_passes/src/check_attr.rs
View File

@ -4,7 +4,7 @@
//! conflicts between multiple such attributes attached to the same //! conflicts between multiple such attributes attached to the same
//! item. //! item.
use crate::errors; use crate::errors::{self, DebugVisualizerUnreadable};
use rustc_ast::{ast, AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem}; use rustc_ast::{ast, AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem};
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{fluent, struct_span_err, Applicability, MultiSpan}; use rustc_errors::{fluent, struct_span_err, Applicability, MultiSpan};
@ -1863,13 +1863,11 @@ fn check_debugger_visualizer(&self, attr: &Attribute, target: Target) -> bool {
match std::fs::File::open(&file) { match std::fs::File::open(&file) {
Ok(_) => true, Ok(_) => true,
Err(err) => { Err(err) => {
self.tcx self.tcx.sess.emit_err(DebugVisualizerUnreadable {
.sess span: meta_item.span,
.struct_span_err( file: &file,
meta_item.span, error: err,
&format!("couldn't read {}: {}", file.display(), err), } );
)
.emit();
false false
} }
} }

11
compiler/rustc_passes/src/errors.rs
View File

@ -1,3 +1,5 @@
use std::{io::Error, path::Path};
use rustc_errors::{Applicability, MultiSpan}; use rustc_errors::{Applicability, MultiSpan};
use rustc_hir::Target; use rustc_hir::Target;
use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic}; use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
@ -527,6 +529,15 @@ pub struct DebugVisualizerInvalid {
pub span: Span, pub span: Span,
} }
#[derive(Diagnostic)]
#[diag(passes::debug_visualizer_unreadable)]
pub struct DebugVisualizerUnreadable<'a> {
#[primary_span]
pub span: Span,
pub file: &'a Path,
pub error: Error,
}
#[derive(Diagnostic)] #[derive(Diagnostic)]
#[diag(passes::rustc_allow_const_fn_unstable)] #[diag(passes::rustc_allow_const_fn_unstable)]
pub struct RustcAllowConstFnUnstable { pub struct RustcAllowConstFnUnstable {