From e87346950039a54c3f0b02d6056cbb92ca38eb28 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 25 Apr 2020 11:52:10 +0200 Subject: [PATCH] text-size 1.0.0 --- Cargo.lock | 8 ++++++-- .../src/completion/complete_unqualified_path.rs | 12 ++++++------ crates/ra_syntax/Cargo.toml | 2 +- crates/ra_text_edit/Cargo.toml | 2 +- crates/ra_text_edit/src/text_edit.rs | 2 +- crates/test_utils/Cargo.toml | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70dfa019d2..20e6cd5403 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1322,7 +1322,9 @@ dependencies = [ [[package]] name = "rowan" -version = "0.10.0-pre.1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e081ed6eacce09e243b619ab90f069c27b0cff8a6d0eb8ad2ec935b65853798" dependencies = [ "rustc-hash", "smol_str", @@ -1623,7 +1625,9 @@ dependencies = [ [[package]] name = "text-size" -version = "1.0.0-pre.1" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f03e7efdedc3bc78cb2337f1e2785c39e45f5ef762d9e4ebb137fff7380a6d8a" [[package]] name = "thin-dst" diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs index b2af81ae5b..56cd086c68 100644 --- a/crates/ra_ide/src/completion/complete_unqualified_path.rs +++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs @@ -1333,8 +1333,8 @@ mod tests { [ CompletionItem { label: "f()", - source_range: [98; 99), - delete: [98; 99), + source_range: 98..99, + delete: 98..99, insert: "f()$0", kind: Function, lookup: "f", @@ -1342,15 +1342,15 @@ mod tests { }, CompletionItem { label: "m", - source_range: [98; 99), - delete: [98; 99), + source_range: 98..99, + delete: 98..99, insert: "m", kind: Module, }, CompletionItem { label: "m::E::V", - source_range: [98; 99), - delete: [98; 99), + source_range: 98..99, + delete: 98..99, insert: "m::E::V", kind: EnumVariant, detail: "()", diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index dda396582f..7ffe46c699 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] itertools = "0.9.0" -rowan = { path = "../../../rowan" } +rowan = "0.10.0" rustc_lexer = { version = "652.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" arrayvec = "0.5.1" diff --git a/crates/ra_text_edit/Cargo.toml b/crates/ra_text_edit/Cargo.toml index 9b0567c981..46a2ab68f4 100644 --- a/crates/ra_text_edit/Cargo.toml +++ b/crates/ra_text_edit/Cargo.toml @@ -9,4 +9,4 @@ publish = false doctest = false [dependencies] -text-size = { path = "../../../text-size" } +text-size = "1.0.0" diff --git a/crates/ra_text_edit/src/text_edit.rs b/crates/ra_text_edit/src/text_edit.rs index db69a7e7b6..eabab4b4d1 100644 --- a/crates/ra_text_edit/src/text_edit.rs +++ b/crates/ra_text_edit/src/text_edit.rs @@ -1,7 +1,7 @@ //! FIXME: write short doc here use crate::AtomTextEdit; -// TODO: fix Cargo.toml + use text_size::{TextRange, TextSize}; #[derive(Debug, Clone)] diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml index 652ab45371..8ec986bcb0 100644 --- a/crates/test_utils/Cargo.toml +++ b/crates/test_utils/Cargo.toml @@ -9,5 +9,5 @@ doctest = false [dependencies] difference = "2.0.0" -text-size = { path = "../../../text-size" } +text-size = "1.0.0" serde_json = "1.0.48"