diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2019-09-05 11:54:01 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2019-09-11 13:30:21 +1000 |
| commit | 8138efae16aea425e9306a41519d97ddb58b6794 (patch) | |
| tree | 7764da62fb1b215d2bdbaad8e9f0e7f84128fa4f | |
| parent | 4fd18c9c06dd7d8165c5259f19847ac22248af66 (diff) | |
| download | rust-8138efae16aea425e9306a41519d97ddb58b6794.tar.gz rust-8138efae16aea425e9306a41519d97ddb58b6794.zip | |
Avoid two `Symbol::as_str()` calls.
| -rw-r--r-- | src/librustc_metadata/native_libs.rs | 4 | ||||
| -rw-r--r-- | src/librustc_mir/const_eval.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs index 66971bb6f8b..ed9a20ec1aa 100644 --- a/src/librustc_metadata/native_libs.rs +++ b/src/librustc_metadata/native_libs.rs @@ -8,7 +8,7 @@ use rustc_target::spec::abi::Abi; use syntax::attr; use syntax::source_map::Span; use syntax::feature_gate::{self, GateIssue}; -use syntax::symbol::{Symbol, sym}; +use syntax::symbol::{kw, sym, Symbol}; use syntax::{span_err, struct_span_err}; pub fn collect(tcx: TyCtxt<'_>) -> Vec<NativeLibrary> { @@ -132,7 +132,7 @@ impl ItemLikeVisitor<'tcx> for Collector<'tcx> { impl Collector<'tcx> { fn register_native_lib(&mut self, span: Option<Span>, lib: NativeLibrary) { - if lib.name.as_ref().map(|s| s.as_str().is_empty()).unwrap_or(false) { + if lib.name.as_ref().map(|&s| s == kw::Invalid).unwrap_or(false) { match span { Some(span) => { struct_span_err!(self.tcx.sess, span, E0454, diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs index db679024dc5..3e02497947a 100644 --- a/src/librustc_mir/const_eval.rs +++ b/src/librustc_mir/const_eval.rs @@ -383,7 +383,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, return Ok(()); } // An intrinsic that we do not support - let intrinsic_name = &ecx.tcx.item_name(instance.def_id()).as_str()[..]; + let intrinsic_name = ecx.tcx.item_name(instance.def_id()); Err( ConstEvalError::NeedsRfc(format!("calling intrinsic `{}`", intrinsic_name)).into() ) |