user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove last traces of identifier hygiene from HIR

Browse source
This commit is contained in:
Vadim Petrochenkov 2016-06-11 00:12:39 +03:00
parent a267d6cee4
commit f59afbc214
7 changed files with 13 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/librustc/hir/lowering.rs
View file

@ -51,10 +51,9 @@ use std::collections::BTreeMap;
use std::iter;
use syntax::ast::*;
use syntax::attr::{ThinAttributes, ThinAttributesExt};
use syntax::ext::mtwt;
use syntax::ptr::P;
use syntax::codemap::{respan, Spanned, Span};
use syntax::parse::token::{self, keywords};
use syntax::parse::token;
use syntax::std_inject;
use syntax::visit::{self, Visitor};
@ -184,16 +183,8 @@ impl<'a> LoweringContext<'a> {
result
}
fn lower_ident(&mut self, ident: Ident) -> Name {
if ident.name != keywords::Invalid.name() {
mtwt::resolve(ident)
} else {
ident.name
}
}
fn lower_opt_sp_ident(&mut self, o_id: Option<Spanned<Ident>>) -> Option<Spanned<Name>> {
o_id.map(|sp_ident| respan(sp_ident.span, self.lower_ident(sp_ident.node)))
o_id.map(|sp_ident| respan(sp_ident.span, sp_ident.node.name))
}
fn lower_attrs(&mut self, attrs: &Vec<Attribute>) -> hir::HirVec<Attribute> {
@ -338,18 +329,14 @@ impl<'a> LoweringContext<'a> {
}
}
fn lower_path_full(&mut self, p: &Path, rename: bool) -> hir::Path {
fn lower_path(&mut self, p: &Path) -> hir::Path {
hir::Path {
global: p.global,
segments: p.segments
.iter()
.map(|&PathSegment { identifier, ref parameters }| {
hir::PathSegment {
name: if rename {
self.lower_ident(identifier)
} else {
identifier.name
},
name: identifier.name,
parameters: self.lower_path_parameters(parameters),
}
})
@ -358,10 +345,6 @@ impl<'a> LoweringContext<'a> {
}
}
fn lower_path(&mut self, p: &Path) -> hir::Path {
self.lower_path_full(p, false)
}
fn lower_path_parameters(&mut self, path_parameters: &PathParameters) -> hir::PathParameters {
match *path_parameters {
PathParameters::AngleBracketed(ref data) =>
@ -870,8 +853,7 @@ impl<'a> LoweringContext<'a> {
// `None` can occur in body-less function signatures
None | Some(Def::Local(..)) => {
hir::PatKind::Binding(this.lower_binding_mode(binding_mode),
respan(pth1.span,
this.lower_ident(pth1.node)),
respan(pth1.span, pth1.node.name),
sub.as_ref().map(|x| this.lower_pat(x)))
}
_ => hir::PatKind::Path(hir::Path::from_name(pth1.span, pth1.node.name))
@ -1238,12 +1220,7 @@ impl<'a> LoweringContext<'a> {
position: position,
}
});
// Only local variables are renamed
let rename = match self.resolver.get_resolution(e.id).map(|d| d.base_def) {
Some(Def::Local(..)) | Some(Def::Upvar(..)) => true,
_ => false,
};
hir::ExprPath(hir_qself, self.lower_path_full(path, rename))
hir::ExprPath(hir_qself, self.lower_path(path))
}
ExprKind::Break(opt_ident) => hir::ExprBreak(self.lower_opt_sp_ident(opt_ident)),
ExprKind::Again(opt_ident) => hir::ExprAgain(self.lower_opt_sp_ident(opt_ident)),

4
src/librustc/hir/mod.rs
View file

@ -1138,7 +1138,7 @@ pub type ExplicitSelf = Spanned<SelfKind>;
impl Arg {
pub fn to_self(&self) -> Option<ExplicitSelf> {
if let PatKind::Binding(BindByValue(mutbl), name, _) = self.pat.node {
if name.node.unhygienize() == keywords::SelfValue.name() {
if name.node == keywords::SelfValue.name() {
return match self.ty.node {
TyInfer => Some(respan(self.pat.span, SelfKind::Value(mutbl))),
TyRptr(lt, MutTy{ref ty, mutbl}) if ty.node == TyInfer => {
@ -1154,7 +1154,7 @@ impl Arg {
pub fn is_self(&self) -> bool {
if let PatKind::Binding(_, name, _) = self.pat.node {
name.node.unhygienize() == keywords::SelfValue.name()
name.node == keywords::SelfValue.name()
} else {
false
}

3
src/librustc/middle/resolve_lifetime.rs
View file

@ -456,8 +456,7 @@ fn extract_labels(ctxt: &mut LifetimeContext, b: &hir::Block) {
fn expression_label(ex: &hir::Expr) -> Option<(ast::Name, Span)> {
match ex.node {
hir::ExprWhile(_, _, Some(label)) |
hir::ExprLoop(_, Some(label)) => Some((label.node.unhygienize(),
label.span)),
hir::ExprLoop(_, Some(label)) => Some((label.node, label.span)),
_ => None,
}
}

3
src/librustc_const_eval/check_match.rs
View file

@ -247,8 +247,7 @@ fn check_for_bindings_named_the_same_as_variants(cx: &MatchCheckCtxt, pat: &Pat)
if let ty::TyEnum(edef, _) = pat_ty.sty {
if let Def::Local(..) = cx.tcx.expect_def(p.id) {
if edef.variants.iter().any(|variant|
variant.name == name.node.unhygienize()
&& variant.kind() == VariantKind::Unit
variant.name == name.node && variant.kind() == VariantKind::Unit
) {
let ty_path = cx.tcx.item_path_str(edef.did);
let mut err = struct_span_warn!(cx.tcx.sess, p.span, E0170,

2
src/librustc_lint/builtin.rs
View file

@ -163,7 +163,7 @@ impl LateLintPass for NonShorthandFieldPatterns {
continue;
}
if let PatKind::Binding(_, ident, None) = fieldpat.node.pat.node {
if ident.node.unhygienize() == fieldpat.node.name {
if ident.node == fieldpat.node.name {
cx.span_lint(NON_SHORTHAND_FIELD_PATTERNS, fieldpat.span,
&format!("the `{}:` in this pattern is redundant and can \
be removed", ident.node))

4
src/librustc_trans/debuginfo/create_scope_map.rs
View file

@ -51,7 +51,7 @@ pub fn create_scope_map(cx: &CrateContext,
for arg in args {
pat_util::pat_bindings(&arg.pat, |_, node_id, _, path1| {
scope_stack.push(ScopeStackEntry { scope_metadata: fn_metadata,
name: Some(path1.node.unhygienize()) });
name: Some(path1.node) });
scope_map.insert(node_id, fn_metadata);
})
}
@ -260,7 +260,7 @@ fn walk_pattern(cx: &CrateContext,
// N.B.: this comparison must be UNhygienic... because
// gdb knows nothing about the context, so any two
// variables with the same name will cause the problem.
let name = path1.node.unhygienize();
let name = path1.node;
let need_new_scope = scope_stack
.iter()
.any(|entry| entry.name == Some(name));

4
src/libsyntax/ast.rs
View file

@ -60,10 +60,6 @@ impl Name {
pub fn as_str(self) -> token::InternedString {
token::InternedString::new_from_name(self)
}
pub fn unhygienize(self) -> Name {
token::intern(&self.as_str())
}
}
impl fmt::Debug for Name {