4 files changed, 8 insertions, 7 deletions

diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs
index 32c924acc..a58a7b21f 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/ra_hir_def/src/body/scope.rs
@@ -192,7 +192,7 @@ mod tests {
         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_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 34d066b1e..a23265fc0 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -99,7 +99,8 @@ fn try_find_src_path(cargo_toml: &Path) -> Result<PathBuf> {
     let rustc_output = Command::new("rustc")
         .current_dir(cargo_toml.parent().unwrap())
         .args(&["--print", "sysroot"])
-        .output()?;
+        .output()
+        .map_err(|e| format!("rustc --print sysroot failed: {}", e))?;
     if !rustc_output.status.success() {
         Err("failed to locate sysroot")?;
     }
diff --git a/crates/ra_text_edit/src/lib.rs b/crates/ra_text_edit/src/lib.rs
index 5f1b12222..37f23d043 100644
--- a/crates/ra_text_edit/src/lib.rs
+++ b/crates/ra_text_edit/src/lib.rs
@@ -29,8 +29,8 @@ impl 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 413c7d782..3291ada42 100644
--- a/crates/ra_text_edit/src/text_edit.rs
+++ b/crates/ra_text_edit/src/text_edit.rs
@@ -66,13 +66,13 @@ impl TextEdit {
         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]);
             }