Skip to content

Commit 9885bc3

Browse files
committed
Update
1 parent bfa344e commit 9885bc3

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
use rustc_ast::{ast, attr, MetaItemInner, MetaItemKind};
2-
use rustc_attr::{list_contains_name, InlineAttr, InstructionSetAttr, OptimizeAttr};
1+
use rustc_ast::{MetaItemInner, MetaItemKind, ast, attr};
2+
use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr, list_contains_name};
33
use rustc_data_structures::fx::FxHashMap;
44
use rustc_errors::codes::*;
5-
use rustc_errors::{struct_span_code_err, DiagMessage, SubdiagMessage};
5+
use rustc_errors::{DiagMessage, SubdiagMessage, struct_span_code_err};
66
use rustc_hir as hir;
77
use rustc_hir::def::DefKind;
8-
use rustc_hir::def_id::{DefId, LocalDefId, LOCAL_CRATE};
8+
use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId};
99
use rustc_hir::weak_lang_items::WEAK_LANG_ITEMS;
10-
use rustc_hir::{lang_items, LangItem};
10+
use rustc_hir::{LangItem, lang_items};
1111
use rustc_middle::middle::codegen_fn_attrs::{
1212
CodegenFnAttrFlags, CodegenFnAttrs, PatchableFunctionEntry,
1313
};
1414
use rustc_middle::mir::mono::Linkage;
1515
use rustc_middle::query::Providers;
1616
use rustc_middle::ty::{self as ty, TyCtxt};
1717
use rustc_session::parse::feature_err;
18-
use rustc_session::{lint, Session};
18+
use rustc_session::{Session, lint};
1919
use rustc_span::symbol::Ident;
20-
use rustc_span::{sym, Span};
21-
use rustc_target::spec::{abi, SanitizerSet};
20+
use rustc_span::{Span, sym};
21+
use rustc_target::spec::{SanitizerSet, abi};
2222

2323
use crate::errors;
2424
use crate::target_features::{check_target_feature_trait_unsafe, from_target_feature_attr};
@@ -399,16 +399,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
399399
.emit();
400400
None
401401
}
402-
_ => {
403-
struct_span_code_err!(
404-
tcx.dcx(),
405-
attr.span,
406-
E0779,
407-
"`[instruction_set]` attribute argument should be valid"
408-
)
409-
.emit();
410-
None
411-
}
402+
_ => None,
412403
}
413404
}
414405
_ => None,

tests/ui/error-codes/E0779.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
#[instruction_set(arm::magic)] //~ ERROR
1+
#[instruction_set(arm::magic)] //~ ERROR `[instruction_set]` attribute argument
2+
// should be valid
23
fn main() {}

0 commit comments

Comments
 (0)