diff options
| author | Alexander Andreev <[email protected]> | 2019-09-30 10:07:26 +0100 |
|---|---|---|
| committer | Alexander Andreev <[email protected]> | 2019-09-30 10:07:26 +0100 |
| commit | 81efd696ccb369d6c4813bad1107bfd9e270385b (patch) | |
| tree | f91b652c3ee8e4503c146bf4f76f129fb9ef1428 /crates/ra_syntax/src/ast/traits.rs | |
| parent | fdbd6bb11a0c47bf9ba1428e6bd432cd2ce72045 (diff) | |
| parent | 733f1d8b709788225bd06f8c0aee1819db92620b (diff) | |
Merge branch 'master' into feature/issue/1856
# Conflicts:
# crates/ra_assists/src/ast_editor.rs
Diffstat (limited to 'crates/ra_syntax/src/ast/traits.rs')
| -rw-r--r-- | crates/ra_syntax/src/ast/traits.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs index c3e676d4c..f275a4955 100644 --- a/crates/ra_syntax/src/ast/traits.rs +++ b/crates/ra_syntax/src/ast/traits.rs | |||
| @@ -99,7 +99,7 @@ pub trait AttrsOwner: AstNode { | |||
| 99 | children(self) | 99 | children(self) |
| 100 | } | 100 | } |
| 101 | fn has_atom_attr(&self, atom: &str) -> bool { | 101 | fn has_atom_attr(&self, atom: &str) -> bool { |
| 102 | self.attrs().filter_map(|x| x.as_atom()).any(|x| x == atom) | 102 | self.attrs().filter_map(|x| x.as_simple_atom()).any(|x| x == atom) |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||