mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanups

Browse Source
This commit is contained in:
Aleksey Kladov 2020-05-05 22:14:01 +02:00
parent d38741f681
commit 381cbc6088
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ra_assists/src/assist_ctx.rs
View File

@ -42,7 +42,6 @@ pub(crate) fn into_resolved(self) -> Option<ResolvedAssist> {
} }
} }
pub(crate) type AssistHandler = fn(AssistCtx) -> Option<Assist>;
/// `AssistCtx` allows to apply an assist or check if it could be applied. /// `AssistCtx` allows to apply an assist or check if it could be applied.
/// ///

14
crates/ra_assists/src/lib.rs
View File

@ -23,7 +23,7 @@ macro_rules! eprintln {
use ra_syntax::{TextRange, TextSize}; use ra_syntax::{TextRange, TextSize};
use ra_text_edit::TextEdit; use ra_text_edit::TextEdit;
pub(crate) use crate::assist_ctx::{Assist, AssistCtx, AssistHandler}; pub(crate) use crate::assist_ctx::{Assist, AssistCtx};
/// Unique identifier of the assist, should not be shown to the user /// Unique identifier of the assist, should not be shown to the user
/// directly. /// directly.
@ -109,7 +109,9 @@ pub fn resolved_assists(db: &RootDatabase, range: FileRange) -> Vec<ResolvedAssi
} }
mod handlers { mod handlers {
use crate::AssistHandler; use crate::{Assist, AssistCtx};
pub(crate) type Handler = fn(AssistCtx) -> Option<Assist>;
mod add_custom_impl; mod add_custom_impl;
mod add_derive; mod add_derive;
@ -145,12 +147,13 @@ mod handlers {
mod reorder_fields; mod reorder_fields;
mod unwrap_block; mod unwrap_block;
pub(crate) fn all() -> &'static [AssistHandler] { pub(crate) fn all() -> &'static [Handler] {
&[ &[
// These are alphabetic for the foolish consistency // These are alphabetic for the foolish consistency
add_custom_impl::add_custom_impl, add_custom_impl::add_custom_impl,
add_derive::add_derive, add_derive::add_derive,
add_explicit_type::add_explicit_type, add_explicit_type::add_explicit_type,
add_from_impl_for_enum::add_from_impl_for_enum,
add_function::add_function, add_function::add_function,
add_impl::add_impl, add_impl::add_impl,
add_new::add_new, add_new::add_new,
@ -176,17 +179,18 @@ pub(crate) fn all() -> &'static [AssistHandler] {
raw_string::remove_hash, raw_string::remove_hash,
remove_dbg::remove_dbg, remove_dbg::remove_dbg,
remove_mut::remove_mut, remove_mut::remove_mut,
reorder_fields::reorder_fields,
replace_if_let_with_match::replace_if_let_with_match, replace_if_let_with_match::replace_if_let_with_match,
replace_let_with_if_let::replace_let_with_if_let, replace_let_with_if_let::replace_let_with_if_let,
replace_qualified_name_with_use::replace_qualified_name_with_use, replace_qualified_name_with_use::replace_qualified_name_with_use,
replace_unwrap_with_match::replace_unwrap_with_match, replace_unwrap_with_match::replace_unwrap_with_match,
split_import::split_import, split_import::split_import,
add_from_impl_for_enum::add_from_impl_for_enum,
unwrap_block::unwrap_block, unwrap_block::unwrap_block,
// These are manually sorted for better priorities // These are manually sorted for better priorities
add_missing_impl_members::add_missing_impl_members, add_missing_impl_members::add_missing_impl_members,
add_missing_impl_members::add_missing_default_members, add_missing_impl_members::add_missing_default_members,
reorder_fields::reorder_fields, // Are you sure you want to add new assist here, and not to the
// sorted list above?
] ]
} }
} }