Skip to content

Commit 3422b40

Browse files
committed
Migrate weak_lang_items.rs
1 parent 0170348 commit 3422b40

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

compiler/rustc_error_messages/locales/en-US/passes.ftl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,3 +265,12 @@ passes_rustc_lint_opt_deny_field_access = `#[rustc_lint_opt_deny_field_access]`
265265
266266
passes_link_ordinal = attribute should be applied to a foreign function or static
267267
.label = not a foreign function or static
268+
269+
passes_missing_panic_handler = `#[panic_handler]` function required, but not found
270+
271+
passes_missing_alloc_error_handler = `#[alloc_error_handler]` function required, but not found
272+
.note = use `#![feature(default_alloc_error_handler)]` for a default error handler
273+
274+
passes_missing_lang_item = language item required, but not found: `{$name}`
275+
.note = this can occur when a binary crate with `#![no_std]` is compiled for a target where `{$name}` is defined in the standard library
276+
.help = you may be able to compile for a target that doesn't need `{$name}`, specify a target with `--target` or in `.cargo/config`

compiler/rustc_passes/src/errors.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,3 +649,20 @@ pub struct RustcLintOptDenyFieldAccess {
649649
#[label]
650650
pub span: Span,
651651
}
652+
653+
#[derive(SessionDiagnostic)]
654+
#[diag(passes::missing_panic_handler)]
655+
pub struct MissingPanicHandler;
656+
657+
#[derive(SessionDiagnostic)]
658+
#[diag(passes::missing_alloc_error_handler)]
659+
#[note]
660+
pub struct MissingAllocErrorHandler;
661+
662+
#[derive(SessionDiagnostic)]
663+
#[diag(passes::missing_lang_item)]
664+
#[note]
665+
#[help]
666+
pub struct MissingLangItem {
667+
pub name: Symbol,
668+
}

compiler/rustc_passes/src/weak_lang_items.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use rustc_middle::middle::lang_items::required;
88
use rustc_middle::ty::TyCtxt;
99
use rustc_session::config::CrateType;
1010

11+
use crate::errors::{MissingAllocErrorHandler, MissingLangItem, MissingPanicHandler};
12+
1113
/// Checks the crate for usage of weak lang items, returning a vector of all the
1214
/// language items required by this crate, but not defined yet.
1315
pub fn check_crate<'tcx>(tcx: TyCtxt<'tcx>, items: &mut lang_items::LanguageItems) {
@@ -71,20 +73,13 @@ fn verify<'tcx>(tcx: TyCtxt<'tcx>, items: &lang_items::LanguageItems) {
7173
for (name, &item) in WEAK_ITEMS_REFS.iter() {
7274
if missing.contains(&item) && required(tcx, item) && items.require(item).is_err() {
7375
if item == LangItem::PanicImpl {
74-
tcx.sess.err("`#[panic_handler]` function required, but not found");
76+
tcx.sess.emit_err(MissingPanicHandler);
7577
} else if item == LangItem::Oom {
7678
if !tcx.features().default_alloc_error_handler {
77-
tcx.sess.err("`#[alloc_error_handler]` function required, but not found");
78-
tcx.sess.note_without_error("use `#![feature(default_alloc_error_handler)]` for a default error handler");
79+
tcx.sess.emit_err(MissingAllocErrorHandler);
7980
}
8081
} else {
81-
tcx
82-
.sess
83-
.diagnostic()
84-
.struct_err(&format!("language item required, but not found: `{}`", name))
85-
.note(&format!("this can occur when a binary crate with `#![no_std]` is compiled for a target where `{}` is defined in the standard library", name))
86-
.help(&format!("you may be able to compile for a target that doesn't need `{}`, specify a target with `--target` or in `.cargo/config`", name))
87-
.emit();
82+
tcx.sess.emit_err(MissingLangItem { name: *name });
8883
}
8984
}
9085
}

0 commit comments

Comments
 (0)