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

internal: slightly improve compile times

Browse source 
As per style guide, avoid monomorphisations
This commit is contained in:
Aleksey Kladov 2021-08-29 12:31:42 +03:00
parent bef5e3096e
commit 78365c64c8
4 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ide/src/ssr.rs
View file

@ -41,7 +41,7 @@ pub(crate) fn ssr_assists(
for (label, source_change) in assists.into_iter() {
let assist = Assist {
id,
label: Label::new(label),
label: Label::new(label.to_string()),
group: Some(GroupLabel("Apply SSR".into())),
target: comment_range,
source_change,

32
crates/ide_assists/src/assist_context.rs
View file

@ -131,12 +131,8 @@ impl Assists {
target: TextRange,
f: impl FnOnce(&mut AssistBuilder),
) -> Option<()> {
if !self.is_allowed(&id) {
return None;
}
let label = Label::new(label.into());
let assist = Assist { id, label, group: None, target, source_change: None };
self.add_impl(assist, f)
let mut f = Some(f);
self.add_impl(None, id, label.into(), target, &mut |it| f.take().unwrap()(it))
}
pub(crate) fn add_group(
@ -146,26 +142,34 @@ impl Assists {
label: impl Into<String>,
target: TextRange,
f: impl FnOnce(&mut AssistBuilder),
) -> Option<()> {
let mut f = Some(f);
self.add_impl(Some(group), id, label.into(), target, &mut |it| f.take().unwrap()(it))
}
fn add_impl(
&mut self,
group: Option<&GroupLabel>,
id: AssistId,
label: String,
target: TextRange,
f: &mut dyn FnMut(&mut AssistBuilder),
) -> Option<()> {
if !self.is_allowed(&id) {
return None;
}
let label = Label::new(label.into());
let assist = Assist { id, label, group: Some(group.clone()), target, source_change: None };
self.add_impl(assist, f)
}
fn add_impl(&mut self, mut assist: Assist, f: impl FnOnce(&mut AssistBuilder)) -> Option<()> {
let source_change = if self.resolve.should_resolve(&assist.id) {
let source_change = if self.resolve.should_resolve(&id) {
let mut builder = AssistBuilder::new(self.file);
f(&mut builder);
Some(builder.finish())
} else {
None
};
assist.source_change = source_change;
self.buf.push(assist);
let label = Label::new(label.into());
let group = group.cloned();
self.buf.push(Assist { id, label, group, target, source_change });
Some(())
}

3
crates/ide_db/src/label.rs
View file

@ -29,8 +29,7 @@ impl From<Label> for String {
}
impl Label {
pub fn new(label: impl Into<String>) -> Label {
let label = label.into();
pub fn new(label: String) -> Label {
assert!(label.starts_with(char::is_uppercase) && !label.ends_with('.'));
Label(label)
}

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

@ -222,7 +222,7 @@ fn unresolved_fix(id: &'static str, label: &str, target: TextRange) -> Assist {
assert!(!id.contains(' '));
Assist {
id: AssistId(id, AssistKind::QuickFix),
label: Label::new(label),
label: Label::new(label.to_string()),
group: None,
target,
source_change: None,