Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
sinkuu committed Feb 19, 2020
1 parent dd0c3c4 commit d06733e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion crates/ra_assists/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub struct GroupLabel(pub String);
impl AssistLabel {
pub(crate) fn new(label: String, id: AssistId) -> AssistLabel {
// FIXME: make fields private, so that this invariant can't be broken
assert!(label.chars().next().unwrap().is_uppercase());
assert!(label.starts_with(|c: char| c.is_uppercase()));
AssistLabel { label, id }
}
}
Expand Down
6 changes: 1 addition & 5 deletions crates/ra_ide/src/completion/presentation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,7 @@ impl Completions {
let (before, after) = (&docs[..idx], &docs[idx + s.len()..]);
// Ensure to match the full word
if after.starts_with('!')
&& before
.chars()
.rev()
.next()
.map_or(true, |c| c != '_' && !c.is_ascii_alphanumeric())
&& !before.ends_with(|c: char| c == '_' || c.is_ascii_alphanumeric())
{
// It may have spaces before the braces like `foo! {}`
match after[1..].chars().find(|&c| !c.is_whitespace()) {
Expand Down
2 changes: 1 addition & 1 deletion crates/ra_mbe/src/subtree_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ fn convert_literal(l: &tt::Literal) -> TtToken {
}

fn convert_ident(ident: &tt::Ident) -> TtToken {
let kind = if let Some('\'') = ident.text.chars().next() {
let kind = if ident.text.starts_with('\'') {
LIFETIME
} else {
SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT)
Expand Down

0 comments on commit d06733e

Please sign in to comment.