Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/lib.rs')
-rw-r--r--crates/ide-assists/src/lib.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/crates/ide-assists/src/lib.rs b/crates/ide-assists/src/lib.rs
index 4b4aa94279..80f05caf4e 100644
--- a/crates/ide-assists/src/lib.rs
+++ b/crates/ide-assists/src/lib.rs
@@ -59,6 +59,8 @@
//! <https://rust-analyzer.github.io/blog/2020/09/28/how-to-make-a-light-bulb.html>
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
+// It's useful to refer to code that is private in doc comments.
+#![allow(rustdoc::private_intra_doc_links)]
mod assist_config;
mod assist_context;
@@ -67,8 +69,8 @@ mod tests;
pub mod utils;
use hir::Semantics;
-use ide_db::{EditionedFileId, RootDatabase};
-use syntax::{Edition, TextRange};
+use ide_db::RootDatabase;
+use syntax::TextRange;
pub(crate) use crate::assist_context::{AssistContext, Assists};
@@ -88,9 +90,7 @@ pub fn assists(
range: ide_db::FileRange,
) -> Vec<Assist> {
let sema = Semantics::new(db);
- let file_id = sema
- .attach_first_edition(range.file_id)
- .unwrap_or_else(|| EditionedFileId::new(db, range.file_id, Edition::CURRENT));
+ let file_id = sema.attach_first_edition(range.file_id);
let ctx = AssistContext::new(sema, config, hir::FileRange { file_id, range: range.range });
let mut acc = Assists::new(&ctx, resolve);
handlers::all().iter().for_each(|handler| {
@@ -105,6 +105,7 @@ mod handlers {
pub(crate) type Handler = fn(&mut Assists, &AssistContext<'_>) -> Option<()>;
mod add_braces;
+ mod add_explicit_dot_deref;
mod add_explicit_enum_discriminant;
mod add_explicit_type;
mod add_label_to_loop;
@@ -119,6 +120,7 @@ mod handlers {
mod change_visibility;
mod convert_bool_then;
mod convert_bool_to_enum;
+ mod convert_char_literal;
mod convert_closure_to_fn;
mod convert_comment_block;
mod convert_comment_from_or_to_doc;
@@ -241,12 +243,12 @@ mod handlers {
&[
// These are alphabetic for the foolish consistency
add_braces::add_braces,
+ add_explicit_dot_deref::add_explicit_method_call_deref,
add_explicit_enum_discriminant::add_explicit_enum_discriminant,
add_explicit_type::add_explicit_type,
add_label_to_loop::add_label_to_loop,
add_lifetime_to_type::add_lifetime_to_type,
add_missing_match_arms::add_missing_match_arms,
- add_return_type::add_return_type,
add_turbo_fish::add_turbo_fish,
apply_demorgan::apply_demorgan_iterator,
apply_demorgan::apply_demorgan,
@@ -256,6 +258,7 @@ mod handlers {
convert_bool_then::convert_bool_then_to_if,
convert_bool_then::convert_if_to_bool_then,
convert_bool_to_enum::convert_bool_to_enum,
+ convert_char_literal::convert_char_literal,
convert_closure_to_fn::convert_closure_to_fn,
convert_comment_block::convert_comment_block,
convert_comment_from_or_to_doc::convert_comment_from_or_to_doc,
@@ -390,6 +393,7 @@ mod handlers {
// used as a tie-breaker.
add_missing_impl_members::add_missing_impl_members,
add_missing_impl_members::add_missing_default_members,
+ add_return_type::add_return_type,
//
replace_string_with_char::replace_string_with_char,
replace_string_with_char::replace_char_with_string,