From 139479e8a376aecff35db2055b9ebd2311935f98 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Mon, 10 Feb 2020 01:57:43 +0200 Subject: [PATCH] move to to_usize() --- crates/ra_hir_def/src/body/scope.rs | 2 +- crates/ra_text_edit/src/lib.rs | 4 ++-- crates/ra_text_edit/src/text_edit.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index a6355232750..5d027994508 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs @@ -194,7 +194,7 @@ fn do_check(code: &str, expected: &[&str]) { let (off, code) = extract_offset(code); let code = { let mut buf = String::new(); - let off = u32::from(off) as usize; + let off = off.to_usize(); buf.push_str(&code[..off]); buf.push_str("marker"); buf.push_str(&code[off..]); diff --git a/crates/ra_text_edit/src/lib.rs b/crates/ra_text_edit/src/lib.rs index 5f1b122221f..37f23d04384 100644 --- a/crates/ra_text_edit/src/lib.rs +++ b/crates/ra_text_edit/src/lib.rs @@ -29,8 +29,8 @@ pub fn insert(offset: TextUnit, text: String) -> AtomTextEdit { } pub fn apply(&self, mut text: String) -> String { - let start = u32::from(self.delete.start()) as usize; - let end = u32::from(self.delete.end()) as usize; + let start = self.delete.start().to_usize(); + let end = self.delete.end().to_usize(); text.replace_range(start..end, &self.insert); text } diff --git a/crates/ra_text_edit/src/text_edit.rs b/crates/ra_text_edit/src/text_edit.rs index 413c7d782eb..3291ada4201 100644 --- a/crates/ra_text_edit/src/text_edit.rs +++ b/crates/ra_text_edit/src/text_edit.rs @@ -66,13 +66,13 @@ pub fn apply(&self, text: &str) -> String { let mut total_len = text.len(); for atom in self.atoms.iter() { total_len += atom.insert.len(); - total_len -= u32::from(atom.delete.end() - atom.delete.start()) as usize; + total_len -= (atom.delete.end() - atom.delete.start()).to_usize(); } let mut buf = String::with_capacity(total_len); let mut prev = 0; for atom in self.atoms.iter() { - let start = u32::from(atom.delete.start()) as usize; - let end = u32::from(atom.delete.end()) as usize; + let start = atom.delete.start().to_usize(); + let end = atom.delete.end().to_usize(); if start > prev { buf.push_str(&text[prev..start]); }