rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

set up rustc_metadata for SessionDiagnostics, port dependency_format.rs

Browse Source
This commit is contained in:
Nathan Stocks
2022-08-23 13:25:03 -06:00
parent 4fd4de7ea3
commit 54645e880f
5 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
compiler/rustc_metadata/src/dependency_format.rs
View File

@@ -52,6 +52,10 @@
//! than finding a number of solutions (there are normally quite a few).
use crate::creader::CStore;
use crate::errors::{
BadPanicStrategy, CrateDepMultiple, IncompatiblePanicInDropStrategy, LibRequired,
RequiredPanicStrategy, RlibRequired, TwoPanicRuntimes,
};
use rustc_data_structures::fx::FxHashMap;
use rustc_hir::def_id::CrateNum;
@@ -136,11 +140,7 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList {
if src.rlib.is_some() {
continue;
}
sess.err(&format!(
"crate `{}` required to be available in rlib format, \
but was not found in this form",
tcx.crate_name(cnum)
));
sess.emit_err(RlibRequired { crate_name: tcx.crate_name(cnum).to_string() });
}
return Vec::new();
}
@@ -224,12 +224,10 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList {
Linkage::Static => "rlib",
_ => "dylib",
};
sess.err(&format!(
"crate `{}` required to be available in {} format, \
but was not found in this form",
tcx.crate_name(cnum),
kind
));
sess.emit_err(LibRequired {
crate_name: tcx.crate_name(cnum).to_string(),
kind: kind.to_string(),
});
}
}
}
@@ -254,16 +252,7 @@ fn add_library(
// can be refined over time.
if link2 != link || link == RequireStatic {
tcx.sess
.struct_err(&format!(
"cannot satisfy dependencies so `{}` only \
shows up once",
tcx.crate_name(cnum)
))
.help(
"having upstream crates all available in one format \
will likely make this go away",
)
.emit();
.emit_err(CrateDepMultiple { crate_name: tcx.crate_name(cnum).to_string() });
}
}
None => {
@@ -358,13 +347,9 @@ fn verify_ok(tcx: TyCtxt<'_>, list: &[Linkage]) {
if tcx.is_panic_runtime(cnum) {
if let Some((prev, _)) = panic_runtime {
let prev_name = tcx.crate_name(prev);
let cur_name = tcx.crate_name(cnum);
sess.err(&format!(
"cannot link together two \
panic runtimes: {} and {}",
prev_name, cur_name
));
let prev_name = tcx.crate_name(prev).to_string();
let cur_name = tcx.crate_name(cnum).to_string();
sess.emit_err(TwoPanicRuntimes { prev_name, cur_name });
}
panic_runtime = Some((
cnum,
@@ -384,13 +369,10 @@ fn verify_ok(tcx: TyCtxt<'_>, list: &[Linkage]) {
// First up, validate that our selected panic runtime is indeed exactly
// our same strategy.
if found_strategy != desired_strategy {
sess.err(&format!(
"the linked panic runtime `{}` is \
not compiled with this crate's \
panic strategy `{}`",
tcx.crate_name(runtime_cnum),
desired_strategy.desc()
));
sess.emit_err(BadPanicStrategy {
runtime: tcx.crate_name(runtime_cnum).to_string(),
strategy: desired_strategy.desc().to_string(),
});
}
// Next up, verify that all other crates are compatible with this panic
@@ -407,28 +389,19 @@ fn verify_ok(tcx: TyCtxt<'_>, list: &[Linkage]) {
}
if let Some(found_strategy) = tcx.required_panic_strategy(cnum) && desired_strategy != found_strategy {
sess.err(&format!(
"the crate `{}` requires \
panic strategy `{}` which is \
incompatible with this crate's \
strategy of `{}`",
tcx.crate_name(cnum),
found_strategy.desc(),
desired_strategy.desc()
));
sess.emit_err(RequiredPanicStrategy {
crate_name: tcx.crate_name(cnum).to_string(),
found_strategy: found_strategy.desc().to_string(),
desired_strategy: desired_strategy.desc().to_string() });
}
let found_drop_strategy = tcx.panic_in_drop_strategy(cnum);
if tcx.sess.opts.unstable_opts.panic_in_drop != found_drop_strategy {
sess.err(&format!(
"the crate `{}` is compiled with the \
panic-in-drop strategy `{}` which is \
incompatible with this crate's \
strategy of `{}`",
tcx.crate_name(cnum),
found_drop_strategy.desc(),
tcx.sess.opts.unstable_opts.panic_in_drop.desc()
));
sess.emit_err(IncompatiblePanicInDropStrategy {
crate_name: tcx.crate_name(cnum).to_string(),
found_strategy: found_drop_strategy.desc().to_string(),
desired_strategy: tcx.sess.opts.unstable_opts.panic_in_drop.desc().to_string(),
});
}
}
}