Merge #35

35: Re-add Index<TextRange> for String r=matklad a=CAD97 These exist in `text_unit`, and seem to be required to index `String`. (Why doesn't deref coersion kick in here? I don't know.) Co-authored-by: CAD97 <[email protected]>
rust-analyzer · Mar 26, 2020 · 192b316 · 192b316
2 parents 53123e5 + b1b7dc1
commit 192b316
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/range.rs b/src/range.rs
@@ -305,14 +305,29 @@ impl TextRange {
 impl Index<TextRange> for str {
     type Output = str;
     #[inline]
-    fn index(&self, index: TextRange) -> &Self::Output {
+    fn index(&self, index: TextRange) -> &str {
+        &self[Range::<usize>::from(index)]
+    }
+}
+
+impl Index<TextRange> for String {
+    type Output = str;
+    #[inline]
+    fn index(&self, index: TextRange) -> &str {
         &self[Range::<usize>::from(index)]
     }
 }
 
 impl IndexMut<TextRange> for str {
     #[inline]
-    fn index_mut(&mut self, index: TextRange) -> &mut Self::Output {
+    fn index_mut(&mut self, index: TextRange) -> &mut str {
+        &mut self[Range::<usize>::from(index)]
+    }
+}
+
+impl IndexMut<TextRange> for String {
+    #[inline]
+    fn index_mut(&mut self, index: TextRange) -> &mut str {
         &mut self[Range::<usize>::from(index)]
     }
 }

diff --git a/tests/indexing.rs b/tests/indexing.rs
@@ -0,0 +1,8 @@
+use text_size::*;
+
+#[test]
+fn main() {
+    let range = TextRange::default();
+    &""[range];
+    &String::new()[range];
+}