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

Rename panic_strategy query to required_panic_strategy

Browse Source
This commit is contained in:
Gary Guo
2022-06-08 21:32:17 +01:00
parent 9e6c044ee6
commit 14d155a3dc
8 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,7 +368,7 @@ fn verify_ok(tcx: TyCtxt<'_>, list: &[Linkage]) {
}
panic_runtime = Some((
cnum,
tcx.panic_strategy(cnum).unwrap_or_else(|| {
tcx.required_panic_strategy(cnum).unwrap_or_else(|| {
bug!("cannot determine panic strategy of a panic runtime");
}),
));
@@ -406,7 +406,7 @@ fn verify_ok(tcx: TyCtxt<'_>, list: &[Linkage]) {
continue;
}
if let Some(found_strategy) = tcx.panic_strategy(cnum) && desired_strategy != found_strategy {
if let Some(found_strategy) = tcx.required_panic_strategy(cnum) && desired_strategy != found_strategy {
sess.err(&format!(
"the crate `{}` requires \
panic strategy `{}` which is \