diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-12 07:52:38 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-12 07:52:38 +0000 |
commit | 0156a538089828340a823ed02da8970bf4f1175b (patch) | |
tree | 07c4eacaad717ea802ab26972f45223281f2c9c1 /crates/ra_analysis/src/lib.rs | |
parent | f655f993fe6d9faa81b0e776b9b24308d2ea1c68 (diff) | |
parent | 0527e3b283af0153cf13fa64fe73862a5b7655c8 (diff) |
Merge #276
276: Extract and rename AtomEdit and Edit into ra_text_edit r=matklad a=vemoo
As discused in #105
Co-authored-by: Bernardo <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index eaf24cb36..22fff71ab 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -18,7 +18,8 @@ pub mod mock_analysis; | |||
18 | 18 | ||
19 | use std::{fmt, sync::Arc}; | 19 | use std::{fmt, sync::Arc}; |
20 | 20 | ||
21 | use ra_syntax::{AtomEdit, SourceFileNode, TextRange, TextUnit}; | 21 | use ra_syntax::{SourceFileNode, TextRange, TextUnit}; |
22 | use ra_text_edit::AtomTextEdit; | ||
22 | use ra_db::FileResolverImp; | 23 | use ra_db::FileResolverImp; |
23 | use rayon::prelude::*; | 24 | use rayon::prelude::*; |
24 | use relative_path::RelativePathBuf; | 25 | use relative_path::RelativePathBuf; |
@@ -120,7 +121,7 @@ pub struct SourceChange { | |||
120 | #[derive(Debug)] | 121 | #[derive(Debug)] |
121 | pub struct SourceFileNodeEdit { | 122 | pub struct SourceFileNodeEdit { |
122 | pub file_id: FileId, | 123 | pub file_id: FileId, |
123 | pub edits: Vec<AtomEdit>, | 124 | pub edits: Vec<AtomTextEdit>, |
124 | } | 125 | } |
125 | 126 | ||
126 | #[derive(Debug)] | 127 | #[derive(Debug)] |