diff options
| author | Mark-Simulacrum <mark.simulacrum@gmail.com> | 2016-11-25 21:21:03 -0700 |
|---|---|---|
| committer | Mark-Simulacrum <mark.simulacrum@gmail.com> | 2016-11-28 18:09:15 -0700 |
| commit | a79c80d0b0f3fa15111ba88fe7260f86ff6df410 (patch) | |
| tree | 95315d0e580deeae2c8cf3e88981c5d9edac5d5a /src/librustc_mir/transform | |
| parent | 9b803ec4217d37fe73f1f738f8007d5d6512a425 (diff) | |
| download | rust-a79c80d0b0f3fa15111ba88fe7260f86ff6df410.tar.gz rust-a79c80d0b0f3fa15111ba88fe7260f86ff6df410.zip | |
Adds TyCtxt::require_lang_item(LangItem) to simplify lang item requires.
Replaces instances of tcx.lang_items.require(..) with fatal unwrap with this method.
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/qualify_consts.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs index 9cd92cf1fdc..9c6922016e0 100644 --- a/src/librustc_mir/transform/qualify_consts.rs +++ b/src/librustc_mir/transform/qualify_consts.rs @@ -1048,9 +1048,7 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants { let cause = traits::ObligationCause::new(mir.span, id, traits::SharedStatic); let mut fulfillment_cx = traits::FulfillmentContext::new(); fulfillment_cx.register_bound(&infcx, ty, - tcx.lang_items - .require(lang_items::SyncTraitLangItem) - .unwrap_or_else(|msg| tcx.sess.fatal(&msg[..])), + tcx.require_lang_item(lang_items::SyncTraitLangItem), cause); if let Err(err) = fulfillment_cx.select_all_or_error(&infcx) { infcx.report_fulfillment_errors(&err); |