diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2016-03-06 15:54:44 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2016-05-16 23:12:18 +0300 |
| commit | 02a1eef6e4eb4bcc214e0e00ddc62406c8990e2d (patch) | |
| tree | a0edfd2c9a7c09622d4db3adf96a21de47851901 | |
| parent | 79b343d87c64e786c79f640675beefa4064100ec (diff) | |
| download | rust-02a1eef6e4eb4bcc214e0e00ddc62406c8990e2d.tar.gz rust-02a1eef6e4eb4bcc214e0e00ddc62406c8990e2d.zip | |
Fix rebase
| -rw-r--r-- | src/librustc/hir/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 1b0b803ddaf..39a6ec9f3af 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1142,8 +1142,8 @@ pub type ExplicitSelf = Spanned<SelfKind>; impl Arg { pub fn to_self(&self) -> Option<ExplicitSelf> { - if let PatKind::Ident(BindByValue(mutbl), ident, _) = self.pat.node { - if ident.node.unhygienic_name == keywords::SelfValue.name() { + if let PatKind::Ident(BindByValue(mutbl), name, _) = self.pat.node { + if name.node.unhygienize() == 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 => { @@ -1158,8 +1158,8 @@ impl Arg { } pub fn is_self(&self) -> bool { - if let PatKind::Ident(_, ident, _) = self.pat.node { - ident.node.unhygienic_name == keywords::SelfValue.name() + if let PatKind::Ident(_, name, _) = self.pat.node { + name.node.unhygienize() == keywords::SelfValue.name() } else { false } |
