diff options
| author | Seivan Heidari <[email protected]> | 2019-11-04 12:45:27 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-04 12:45:27 +0000 |
| commit | dad9bc6caad71e6aebb92ad9883c08d30431e9b1 (patch) | |
| tree | 6495d47108bc56ab0fbb358125fe65ebece8934f /crates/ra_tt/src | |
| parent | 1d8bb4c6c1fef1f8ea513e07d0a7d4c5483129d2 (diff) | |
| parent | cc2d75d0f88bdcb1b3e20db36decb6ee6eca517a (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_tt/src')
| -rw-r--r-- | crates/ra_tt/src/buffer.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_tt/src/buffer.rs b/crates/ra_tt/src/buffer.rs index ef3f2323c..14b3f707d 100644 --- a/crates/ra_tt/src/buffer.rs +++ b/crates/ra_tt/src/buffer.rs | |||
| @@ -111,7 +111,7 @@ impl<'a> Cursor<'a> { | |||
| 111 | 111 | ||
| 112 | /// If the cursor is pointing at the end of a subtree, returns | 112 | /// If the cursor is pointing at the end of a subtree, returns |
| 113 | /// the parent subtree | 113 | /// the parent subtree |
| 114 | pub fn end(self) -> Option<(&'a Subtree)> { | 114 | pub fn end(self) -> Option<&'a Subtree> { |
| 115 | match self.entry() { | 115 | match self.entry() { |
| 116 | Some(Entry::End(Some(ptr))) => { | 116 | Some(Entry::End(Some(ptr))) => { |
| 117 | let idx = ptr.1; | 117 | let idx = ptr.1; |
| @@ -127,7 +127,7 @@ impl<'a> Cursor<'a> { | |||
| 127 | } | 127 | } |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | fn entry(self) -> Option<(&'a Entry<'a>)> { | 130 | fn entry(self) -> Option<&'a Entry<'a>> { |
| 131 | self.buffer.entry(&self.ptr) | 131 | self.buffer.entry(&self.ptr) |
| 132 | } | 132 | } |
| 133 | 133 | ||