language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #3075

Browse source 
3075: Migrate u32::from(TextUnit) as usize to .to_usize() r=matklad a=Veetaha

@matklad I see 29 uses of `.to_usize()` cast, wouldn't it be reasonable to change `TextUnit(u32)` to `TextUnit(usize)` ? Or do you have reasons to stick with `u32` here?

Co-authored-by: Veetaha <gerzoh1@gmail.com>
This commit is contained in:
bors[bot] 2020-02-10 09:06:01 +00:00 • committed by GitHub
commit b4ac3dda78
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir_def/src/body/scope.rs
View file

@ -194,7 +194,7 @@ mod tests {
let (off, code) = extract_offset(code); let (off, code) = extract_offset(code);
let code = { let code = {
let mut buf = String::new(); 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(&code[..off]);
buf.push_str("marker"); buf.push_str("marker");
buf.push_str(&code[off..]); buf.push_str(&code[off..]);

4
crates/ra_text_edit/src/lib.rs
View file

@ -29,8 +29,8 @@ impl AtomTextEdit {
} }
pub fn apply(&self, mut text: String) -> String { pub fn apply(&self, mut text: String) -> String {
let start = u32::from(self.delete.start()) as usize; let start = self.delete.start().to_usize();
let end = u32::from(self.delete.end()) as usize; let end = self.delete.end().to_usize();
text.replace_range(start..end, &self.insert); text.replace_range(start..end, &self.insert);
text text
} }

6
crates/ra_text_edit/src/text_edit.rs
View file

@ -66,13 +66,13 @@ impl TextEdit {
let mut total_len = text.len(); let mut total_len = text.len();
for atom in self.atoms.iter() { for atom in self.atoms.iter() {
total_len += atom.insert.len(); 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 buf = String::with_capacity(total_len);
let mut prev = 0; let mut prev = 0;
for atom in self.atoms.iter() { for atom in self.atoms.iter() {
let start = u32::from(atom.delete.start()) as usize; let start = atom.delete.start().to_usize();
let end = u32::from(atom.delete.end()) as usize; let end = atom.delete.end().to_usize();
if start > prev { if start > prev {
buf.push_str(&text[prev..start]); buf.push_str(&text[prev..start]);
} }