language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

internal: use API stabilized in 1.52

Browse source
This commit is contained in:
Aleksey Kladov 2021-05-04 14:10:49 +03:00 • committed by Kirill Bulatov
parent 3b4d5df840
commit 6a16ec52aa
7 changed files with 16 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/test_utils/src/fixture.rs
View file

@ -62,7 +62,7 @@
//! ```
use rustc_hash::FxHashMap;
use stdx::{lines_with_ends, split_once, trim_indent};
use stdx::trim_indent;
#[derive(Debug, Eq, PartialEq)]
pub struct Fixture {
@ -93,7 +93,7 @@ impl Fixture {
let default = if ra_fixture.contains("//-") { None } else { Some("//- /main.rs") };
for (ix, line) in default.into_iter().chain(lines_with_ends(&fixture)).enumerate() {
for (ix, line) in default.into_iter().chain(fixture.split_inclusive('\n')).enumerate() {
if line.contains("//-") {
assert!(
line.starts_with("//-"),
@ -133,14 +133,14 @@ impl Fixture {
let mut env = FxHashMap::default();
let mut introduce_new_source_root = false;
for component in components[1..].iter() {
let (key, value) = split_once(component, ':').unwrap();
let (key, value) = component.split_once(':').unwrap();
match key {
"crate" => krate = Some(value.to_string()),
"deps" => deps = value.split(',').map(|it| it.to_string()).collect(),
"edition" => edition = Some(value.to_string()),
"cfg" => {
for entry in value.split(',') {
match split_once(entry, '=') {
match entry.split_once('=') {
Some((k, v)) => cfg_key_values.push((k.to_string(), v.to_string())),
None => cfg_atoms.push(entry.to_string()),
}
@ -148,7 +148,7 @@ impl Fixture {
}
"env" => {
for key in value.split(',') {
if let Some((k, v)) = split_once(key, '=') {
if let Some((k, v)) = key.split_once('=') {
env.insert(k.into(), v.into());
}
}

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

@ -17,7 +17,7 @@ use std::{
};
use profile::StopWatch;
use stdx::{is_ci, lines_with_ends};
use stdx::is_ci;
use text_size::{TextRange, TextSize};
pub use dissimilar::diff as __diff;
@ -181,7 +181,7 @@ pub fn extract_annotations(text: &str) -> Vec<(TextRange, String)> {
let mut prev_line_start: Option<TextSize> = None;
let mut line_start: TextSize = 0.into();
let mut prev_line_annotations: Vec<(TextSize, usize)> = Vec::new();
for line in lines_with_ends(text) {
for line in text.split_inclusive('\n') {
let mut this_line_annotations = Vec::new();
if let Some(idx) = line.find("//") {
let annotation_offset = TextSize::of(&line[..idx + "//".len()]);