From 3d78f502bdb74a2d0b9cc8d9bb990e0a471dfb8c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 13 Jan 2021 20:10:46 +0300
Subject: Use upstream TextSize API

---
 crates/ide/src/syntax_highlighting/highlights.rs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'crates/ide/src/syntax_highlighting/highlights.rs')

diff --git a/crates/ide/src/syntax_highlighting/highlights.rs b/crates/ide/src/syntax_highlighting/highlights.rs
index c6f0417ec..882a685a5 100644
--- a/crates/ide/src/syntax_highlighting/highlights.rs
+++ b/crates/ide/src/syntax_highlighting/highlights.rs
@@ -1,5 +1,5 @@
 //! Collects a tree of highlighted ranges and flattens it.
-use std::{cmp::Ordering, iter};
+use std::iter;
 
 use stdx::equal_range_by;
 use syntax::TextRange;
@@ -52,7 +52,7 @@ impl Node {
         }
 
         let overlapping =
-            equal_range_by(&self.nested, |n| ordering(n.hl_range.range, hl_range.range));
+            equal_range_by(&self.nested, |n| TextRange::ordering(n.hl_range.range, hl_range.range));
 
         if overlapping.len() == 1
             && self.nested[overlapping.start].hl_range.range.contains_range(hl_range.range)
@@ -90,13 +90,3 @@ impl Node {
         }
     }
 }
-
-pub(super) fn ordering(r1: TextRange, r2: TextRange) -> Ordering {
-    if r1.end() <= r2.start() {
-        Ordering::Less
-    } else if r2.end() <= r1.start() {
-        Ordering::Greater
-    } else {
-        Ordering::Equal
-    }
-}
-- 
cgit v1.2.3