Skip to content

Commit bfa344e

Browse files
committed
Update
1 parent 58d5a81 commit bfa344e

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
use rustc_ast::{MetaItemInner, MetaItemKind, ast, attr};
2-
use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr, list_contains_name};
1+
use rustc_ast::{ast, attr, MetaItemInner, MetaItemKind};
2+
use rustc_attr::{list_contains_name, InlineAttr, InstructionSetAttr, OptimizeAttr};
33
use rustc_data_structures::fx::FxHashMap;
44
use rustc_errors::codes::*;
5-
use rustc_errors::{DiagMessage, SubdiagMessage, struct_span_code_err};
5+
use rustc_errors::{struct_span_code_err, DiagMessage, SubdiagMessage};
66
use rustc_hir as hir;
77
use rustc_hir::def::DefKind;
8-
use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId};
8+
use rustc_hir::def_id::{DefId, LocalDefId, LOCAL_CRATE};
99
use rustc_hir::weak_lang_items::WEAK_LANG_ITEMS;
10-
use rustc_hir::{LangItem, lang_items};
10+
use rustc_hir::{lang_items, LangItem};
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::{Session, lint};
18+
use rustc_session::{lint, Session};
1919
use rustc_span::symbol::Ident;
20-
use rustc_span::{Span, sym};
21-
use rustc_target::spec::{SanitizerSet, abi};
20+
use rustc_span::{sym, Span};
21+
use rustc_target::spec::{abi, SanitizerSet};
2222

2323
use crate::errors;
2424
use crate::target_features::{check_target_feature_trait_unsafe, from_target_feature_attr};
@@ -399,7 +399,16 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
399399
.emit();
400400
None
401401
}
402-
_ => None,
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+
}
403412
}
404413
}
405414
_ => None,

compiler/rustc_error_codes/src/error_codes/E0779.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Erroneous code example:
55
```compile_fail,E0779
66
#![feature(isa_attribute)]
77
8-
#[instruction_set(intel::x64)] // error: `[instruction_set]` attribute argument should be valid
8+
#[instruction_set(intel::x64)] // error: `[instruction_set]` attribute argument
9+
// should be valid
910
pub fn something() {}
1011
fn main() {}
1112
```

0 commit comments

Comments
 (0)