bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Apply suggestions from code review

Browse source 
commit suggestion of not always pretty printing

Co-authored-by: Urgau <3616612+Urgau@users.noreply.github.com>
This commit is contained in:
Sven Kanoldt 2024-12-09 20:23:02 +01:00
parent 1696f534ab
commit 7951d19280
No known key found for this signature in database
GPG key ID: 3696C99F3E0EAF95
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_codegen_ssa/src/codegen_attrs.rs
View file

@ -120,7 +120,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
mixed_export_name_no_mangle_lint_state.track_no_mangle( mixed_export_name_no_mangle_lint_state.track_no_mangle(
attr.span, attr.span,
tcx.local_def_id_to_hir_id(did), tcx.local_def_id_to_hir_id(did),
rustc_ast_pretty::pprust::attribute_to_string(attr), attr,
); );
} else { } else {
tcx.dcx() tcx.dcx()
@ -788,22 +788,22 @@ fn check_link_name_xor_ordinal(
} }
#[derive(Default)] #[derive(Default)]
struct MixedExportNameAndNoMangleState { struct MixedExportNameAndNoMangleState<'a> {
export_name: Option<Span>, export_name: Option<Span>,
hir_id: Option<HirId>, hir_id: Option<HirId>,
no_mangle: Option<Span>, no_mangle: Option<Span>,
no_mangle_attr_name: Option<String>, no_mangle_attr: Option<&'a ast::Attribute>,
} }
impl MixedExportNameAndNoMangleState { impl<'a> MixedExportNameAndNoMangleState<'a> {
fn track_export_name(&mut self, span: Span) { fn track_export_name(&mut self, span: Span) {
self.export_name = Some(span); self.export_name = Some(span);
} }
fn track_no_mangle(&mut self, span: Span, hir_id: HirId, attr_name: String) { fn track_no_mangle(&mut self, span: Span, hir_id: HirId, attr_name: &'a ast::Attribute) {
self.no_mangle = Some(span); self.no_mangle = Some(span);
self.hir_id = Some(hir_id); self.hir_id = Some(hir_id);
self.no_mangle_attr_name = Some(attr_name); self.no_mangle_attr = Some(attr_name);
} }
/// Emit diagnostics if the lint condition is met. /// Emit diagnostics if the lint condition is met.
@ -812,7 +812,7 @@ impl MixedExportNameAndNoMangleState {
export_name: Some(export_name), export_name: Some(export_name),
no_mangle: Some(no_mangle), no_mangle: Some(no_mangle),
hir_id: Some(hir_id), hir_id: Some(hir_id),
no_mangle_attr_name: Some(no_mangle_attr_name), no_mangle_attr: Some(no_mangle_attr),
} = self } = self
{ {
tcx.emit_node_span_lint( tcx.emit_node_span_lint(
@ -821,7 +821,7 @@ impl MixedExportNameAndNoMangleState {
no_mangle, no_mangle,
errors::MixedExportNameAndNoMangle { errors::MixedExportNameAndNoMangle {
no_mangle, no_mangle,
no_mangle_attr: no_mangle_attr_name, no_mangle_attr: rustc_ast_pretty::pprust::attribute_to_string(no_mangle_attr),
export_name, export_name,
removal_span: no_mangle, removal_span: no_mangle,
}, },