Change rustc::util::common::FN_OUTPUT_NAME to a Symbol.

This commit is contained in:
Nicholas Nethercote 2019-05-17 15:21:31 +10:00
parent c2e49bf1a2
commit be3724fb7c
4 changed files with 6 additions and 4 deletions

View file

@ -2218,7 +2218,7 @@ impl<'a> LoweringContext<'a> {
bindings: hir_vec![
hir::TypeBinding {
hir_id: this.next_id(),
ident: Ident::from_str(FN_OUTPUT_NAME),
ident: Ident::with_empty_ctxt(FN_OUTPUT_NAME),
ty: output
.as_ref()
.map(|ty| this.lower_ty(&ty, ImplTraitContext::disallowed()))
@ -2543,7 +2543,7 @@ impl<'a> LoweringContext<'a> {
let future_params = P(hir::GenericArgs {
args: hir_vec![],
bindings: hir_vec![hir::TypeBinding {
ident: Ident::from_str(FN_OUTPUT_NAME),
ident: Ident::with_empty_ctxt(FN_OUTPUT_NAME),
ty: output_ty,
hir_id: self.next_id(),
span,

View file

@ -1421,7 +1421,7 @@ fn confirm_callable_candidate<'cx, 'gcx, 'tcx>(
projection_ty: ty::ProjectionTy::from_ref_and_name(
tcx,
trait_ref,
Ident::from_str(FN_OUTPUT_NAME),
Ident::with_empty_ctxt(FN_OUTPUT_NAME),
),
ty: ret_type
}

View file

@ -11,6 +11,7 @@ use std::time::{Duration, Instant};
use std::sync::mpsc::{Sender};
use syntax_pos::{SpanData};
use syntax::symbol::{Symbol, sym};
use rustc_macros::HashStable;
use crate::ty::TyCtxt;
use crate::dep_graph::{DepNode};
@ -18,7 +19,7 @@ use lazy_static;
use crate::session::Session;
// The name of the associated type for `Fn` return types
pub const FN_OUTPUT_NAME: &str = "Output";
pub const FN_OUTPUT_NAME: Symbol = sym::Output;
// Useful type to use with `Result<>` indicate that an error has already
// been reported to the user, so no need to continue checking.

View file

@ -385,6 +385,7 @@ symbols! {
option,
Option,
opt_out_copy,
Output,
overlapping_marker_traits,
packed,
panic_handler,