Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 04:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Slightly better name

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-23 21:29:50 +02:00
parent 9caf810129
commit ff687453a8
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_ide/src/display/function_signature.rs
View file

@ -10,7 +10,7 @@ use std::{
use hir::{Docs, Documentation, HasSource, HirDisplay};
use ra_ide_db::RootDatabase;
use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
use stdx::{split1, SepBy};
use stdx::{split_delim, SepBy};
use crate::display::{generic_parameters, where_predicates};
@ -210,7 +210,7 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
// macro-generated functions are missing whitespace
fn fmt_param(param: ast::Param) -> String {
let text = param.syntax().text().to_string();
match split1(&text, ':') {
match split_delim(&text, ':') {
Some((left, right)) => format!("{}: {}", left.trim(), right.trim()),
_ => text,
}

4
crates/rust-analyzer/src/main_loop/handlers.rs
View file

@ -26,7 +26,7 @@ use ra_project_model::TargetKind;
use ra_syntax::{AstNode, SyntaxKind, TextRange, TextSize};
use serde::{Deserialize, Serialize};
use serde_json::to_value;
use stdx::{format_to, split1};
use stdx::{format_to, split_delim};
use crate::{
cargo_target_spec::CargoTargetSpec,
@ -785,7 +785,7 @@ pub fn handle_resolve_code_action(
let frange = FileRange { file_id, range };
let assists = snap.analysis().resolved_assists(&snap.config.assist, frange)?;
let (id_string, index) = split1(&params.id, ':').unwrap();
let (id_string, index) = split_delim(&params.id, ':').unwrap();
let index = index.parse::<usize>().unwrap();
let assist = &assists[index];
assert!(assist.assist.id.0 == id_string);

2
crates/stdx/src/lib.rs
View file

@ -124,7 +124,7 @@ pub fn replace(buf: &mut String, from: char, to: &str) {
*buf = buf.replace(from, to)
}
pub fn split1(haystack: &str, delim: char) -> Option<(&str, &str)> {
pub fn split_delim(haystack: &str, delim: char) -> Option<(&str, &str)> {
let idx = haystack.find(delim)?;
Some((&haystack[..idx], &haystack[idx + delim.len_utf8()..]))
}

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

@ -2,7 +2,7 @@
//! rust-analyzer database from a single string.
use rustc_hash::FxHashMap;
use stdx::split1;
use stdx::split_delim;
#[derive(Debug, Eq, PartialEq)]
pub struct Fixture {
@ -81,14 +81,14 @@ The offending line: {:?}"#,
let mut cfg_key_values = Vec::new();
let mut env = FxHashMap::default();
for component in components[1..].iter() {
let (key, value) = split1(component, ':').unwrap();
let (key, value) = split_delim(component, ':').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 split1(entry, '=') {
match split_delim(entry, '=') {
Some((k, v)) => cfg_key_values.push((k.to_string(), v.to_string())),
None => cfg_atoms.push(entry.to_string()),
}
@ -96,7 +96,7 @@ The offending line: {:?}"#,
}
"env" => {
for key in value.split(',') {
if let Some((k, v)) = split1(key, '=') {
if let Some((k, v)) = split_delim(key, '=') {
env.insert(k.into(), v.into());
}
}