bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use tcx.require_lang_item

Browse source
This commit is contained in:
Cameron Steffen 2022-10-29 16:09:15 -05:00
parent 1c8e658820
commit 88d71504dd
3 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_monomorphize/src/collector.rs
View file

@ -201,7 +201,7 @@ use std::iter;
use std::ops::Range;
use std::path::PathBuf;
use crate::errors::{LargeAssignmentsLint, RecursionLimit, RequiresLangItem, TypeLengthLimit};
use crate::errors::{LargeAssignmentsLint, RecursionLimit, TypeLengthLimit};
#[derive(PartialEq)]
pub enum MonoItemCollectionMode {
@ -1298,14 +1298,7 @@ impl<'v> RootCollector<'_, 'v> {
return;
};
let start_def_id = match self.tcx.lang_items().require(LangItem::Start) {
Ok(s) => s,
Err(lang_item_err) => {
self.tcx
.sess
.emit_fatal(RequiresLangItem { lang_item: lang_item_err.0.name().to_string() });
}
};
let start_def_id = self.tcx.require_lang_item(LangItem::Start, None);
let main_ret_ty = self.tcx.fn_sig(main_def_id).output();
// Given that `main()` has no arguments,

6
compiler/rustc_monomorphize/src/errors.rs
View file

@ -32,12 +32,6 @@ pub struct TypeLengthLimit {
pub type_length: usize,
}
#[derive(Diagnostic)]
#[diag(monomorphize_requires_lang_item)]
pub struct RequiresLangItem {
pub lang_item: String,
}
pub struct UnusedGenericParams {
pub span: Span,
pub param_spans: Vec<Span>,