diff options
| -rw-r--r-- | src/librustc_mir/build/expr/into.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_mir/build/expr/into.rs b/src/librustc_mir/build/expr/into.rs index e7388b92054..c9e5fca4d75 100644 --- a/src/librustc_mir/build/expr/into.rs +++ b/src/librustc_mir/build/expr/into.rs @@ -200,16 +200,15 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { ty::FnDef(def_id, _) => { let f = ty.fn_sig(this.hir.tcx()); if f.abi() == Abi::RustIntrinsic || f.abi() == Abi::PlatformIntrinsic { - Some(this.hir.tcx().item_name(def_id).as_str()) + Some(this.hir.tcx().item_name(def_id)) } else { None } } _ => None, }; - let intrinsic = intrinsic.as_ref().map(|s| &s[..]); let fun = unpack!(block = this.as_local_operand(block, fun)); - if intrinsic == Some("move_val_init") { + if let Some(sym::move_val_init) = intrinsic { // `move_val_init` has "magic" semantics - the second argument is // always evaluated "directly" into the first one. diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index c41f413970f..b3e9576f43f 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -432,6 +432,7 @@ symbols! { module, module_path, more_struct_aliases, + move_val_init, movbe_target_feature, must_use, naked, |