prefer default over new
diff --git a/crates/base-db/src/change.rs b/crates/base-db/src/change.rs
index 114b4cb..da2fb27 100644
--- a/crates/base-db/src/change.rs
+++ b/crates/base-db/src/change.rs
@@ -34,10 +34,6 @@
}
impl FileChange {
- pub fn new() -> Self {
- FileChange::default()
- }
-
pub fn set_roots(&mut self, roots: Vec<SourceRoot>) {
self.roots = Some(roots);
}
diff --git a/crates/hir-def/src/dyn_map.rs b/crates/hir-def/src/dyn_map.rs
index b17a2b0..eed1490 100644
--- a/crates/hir-def/src/dyn_map.rs
+++ b/crates/hir-def/src/dyn_map.rs
@@ -112,6 +112,10 @@
}
impl<K, V, P> Key<K, V, P> {
+ #[allow(
+ clippy::new_without_default,
+ reason = "this a const fn, so it can't be default yet. See <https://github.com/rust-lang/rust/issues/63065>"
+ )]
pub(crate) const fn new() -> Key<K, V, P> {
Key { _phantom: PhantomData }
}
@@ -148,16 +152,11 @@
}
}
+#[derive(Default)]
pub struct DynMap {
pub(crate) map: Map,
}
-impl Default for DynMap {
- fn default() -> Self {
- DynMap { map: Map::new() }
- }
-}
-
#[repr(transparent)]
pub struct KeyMap<KEY> {
map: DynMap,
diff --git a/crates/hir-def/src/expr_store/lower.rs b/crates/hir-def/src/expr_store/lower.rs
index c56b857..2d6e8f0 100644
--- a/crates/hir-def/src/expr_store/lower.rs
+++ b/crates/hir-def/src/expr_store/lower.rs
@@ -2053,7 +2053,7 @@
f: ast::FormatArgsExpr,
syntax_ptr: AstPtr<ast::Expr>,
) -> ExprId {
- let mut args = FormatArgumentsCollector::new();
+ let mut args = FormatArgumentsCollector::default();
f.args().for_each(|arg| {
args.add(FormatArgument {
kind: match arg.name() {
diff --git a/crates/hir-def/src/hir/format_args.rs b/crates/hir-def/src/hir/format_args.rs
index 821ec56..ca51f49 100644
--- a/crates/hir-def/src/hir/format_args.rs
+++ b/crates/hir-def/src/hir/format_args.rs
@@ -460,10 +460,6 @@
}
}
- pub fn new() -> Self {
- Default::default()
- }
-
pub fn add(&mut self, arg: FormatArgument) -> usize {
let index = self.arguments.len();
if let Some(name) = arg.kind.ident() {
diff --git a/crates/hir-expand/src/change.rs b/crates/hir-expand/src/change.rs
index 3f5b8fd..6873cb7 100644
--- a/crates/hir-expand/src/change.rs
+++ b/crates/hir-expand/src/change.rs
@@ -14,10 +14,6 @@
}
impl ChangeWithProcMacros {
- pub fn new() -> Self {
- Self::default()
- }
-
pub fn apply(self, db: &mut impl ExpandDatabase) {
let crates_id_map = self.source_change.apply(db);
if let Some(proc_macros) = self.proc_macros {
diff --git a/crates/ide-assists/src/handlers/add_braces.rs b/crates/ide-assists/src/handlers/add_braces.rs
index d8db7cc..b6e3b0a 100644
--- a/crates/ide-assists/src/handlers/add_braces.rs
+++ b/crates/ide-assists/src/handlers/add_braces.rs
@@ -39,7 +39,7 @@
},
expr.syntax().text_range(),
|builder| {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let mut editor = builder.make_editor(expr.syntax());
let block_expr = make.block_expr(None, Some(expr.clone()));
diff --git a/crates/ide-assists/src/handlers/add_missing_match_arms.rs b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
index 4cabf4b..777e40e 100644
--- a/crates/ide-assists/src/handlers/add_missing_match_arms.rs
+++ b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
@@ -77,7 +77,7 @@
let cfg = ctx.config.import_path_config();
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let module = ctx.sema.scope(expr.syntax())?.module();
let (mut missing_pats, is_non_exhaustive, has_hidden_variants): (
@@ -467,7 +467,7 @@
let fields = var.fields(db);
let pat: ast::Pat = match var.kind(db) {
hir::StructKind::Tuple => {
- let mut name_generator = suggest_name::NameGenerator::new();
+ let mut name_generator = suggest_name::NameGenerator::default();
let pats = fields.into_iter().map(|f| {
let name = name_generator.for_type(&f.ty(db), db, edition);
match name {
diff --git a/crates/ide-assists/src/handlers/add_turbo_fish.rs b/crates/ide-assists/src/handlers/add_turbo_fish.rs
index 4901962..245aa3a 100644
--- a/crates/ide-assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ide-assists/src/handlers/add_turbo_fish.rs
@@ -141,7 +141,7 @@
|builder| {
builder.trigger_parameter_hints();
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let mut editor = match &turbofish_target {
Either::Left(it) => builder.make_editor(it.syntax()),
Either::Right(it) => builder.make_editor(it.syntax()),
diff --git a/crates/ide-assists/src/handlers/apply_demorgan.rs b/crates/ide-assists/src/handlers/apply_demorgan.rs
index daab992..e03b4ab 100644
--- a/crates/ide-assists/src/handlers/apply_demorgan.rs
+++ b/crates/ide-assists/src/handlers/apply_demorgan.rs
@@ -64,7 +64,7 @@
_ => return None,
};
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let demorganed = bin_expr.clone_subtree();
let mut editor = SyntaxEditor::new(demorganed.syntax().clone());
@@ -111,7 +111,7 @@
"Apply De Morgan's law",
op_range,
|builder| {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let paren_expr = bin_expr.syntax().parent().and_then(ast::ParenExpr::cast);
let neg_expr = paren_expr
.clone()
@@ -194,7 +194,7 @@
label,
op_range,
|builder| {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let mut editor = builder.make_editor(method_call.syntax());
// replace the method name
let new_name = match name.text().as_str() {
diff --git a/crates/ide-assists/src/handlers/convert_bool_then.rs b/crates/ide-assists/src/handlers/convert_bool_then.rs
index f3210a6..ba5488e 100644
--- a/crates/ide-assists/src/handlers/convert_bool_then.rs
+++ b/crates/ide-assists/src/handlers/convert_bool_then.rs
@@ -98,7 +98,7 @@
let closure_body = ast::Expr::cast(edit.new_root().clone()).unwrap();
let mut editor = builder.make_editor(expr.syntax());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let closure_body = match closure_body {
ast::Expr::BlockExpr(block) => unwrap_trivial_block(block),
e => e,
@@ -216,7 +216,7 @@
let closure_body = ast::BlockExpr::cast(edit.new_root().clone()).unwrap();
let mut editor = builder.make_editor(mcall.syntax());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let cond = match &receiver {
ast::Expr::ParenExpr(expr) => expr.expr().unwrap_or(receiver),
diff --git a/crates/ide-assists/src/handlers/convert_for_to_while_let.rs b/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
index 801a57b..51b16ca 100644
--- a/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
+++ b/crates/ide-assists/src/handlers/convert_for_to_while_let.rs
@@ -51,7 +51,7 @@
"Replace this for loop with `while let`",
for_loop.syntax().text_range(),
|builder| {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let mut editor = builder.make_editor(for_loop.syntax());
let (iterable, method) = if impls_core_iter(&ctx.sema, &iterable) {
diff --git a/crates/ide-assists/src/handlers/extract_variable.rs b/crates/ide-assists/src/handlers/extract_variable.rs
index 95ea8b3..f44f4ba 100644
--- a/crates/ide-assists/src/handlers/extract_variable.rs
+++ b/crates/ide-assists/src/handlers/extract_variable.rs
@@ -170,7 +170,7 @@
|edit| {
let (var_name, expr_replace) = kind.get_name_and_expr(ctx, &to_extract);
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let mut editor = edit.make_editor(&expr_replace);
let pat_name = make.name(&var_name);
diff --git a/crates/ide-assists/src/handlers/flip_binexpr.rs b/crates/ide-assists/src/handlers/flip_binexpr.rs
index 94d7b73..2ac9fd8 100644
--- a/crates/ide-assists/src/handlers/flip_binexpr.rs
+++ b/crates/ide-assists/src/handlers/flip_binexpr.rs
@@ -48,7 +48,7 @@
op_token.text_range(),
|builder| {
let mut editor = builder.make_editor(&expr.syntax().parent().unwrap());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
if let FlipAction::FlipAndReplaceOp(binary_op) = action {
editor.replace(op_token, make.token(binary_op))
};
diff --git a/crates/ide-assists/src/handlers/flip_comma.rs b/crates/ide-assists/src/handlers/flip_comma.rs
index 25e514b..7045e4b 100644
--- a/crates/ide-assists/src/handlers/flip_comma.rs
+++ b/crates/ide-assists/src/handlers/flip_comma.rs
@@ -101,7 +101,7 @@
]
.concat();
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let new_token_tree = make.token_tree(tree.left_delimiter_token().unwrap().kind(), result);
(new_token_tree, make.finish_with_mappings())
}
diff --git a/crates/ide-assists/src/handlers/generate_enum_variant.rs b/crates/ide-assists/src/handlers/generate_enum_variant.rs
index 8a20a2d..4c45412 100644
--- a/crates/ide-assists/src/handlers/generate_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/generate_enum_variant.rs
@@ -60,7 +60,7 @@
acc.add(AssistId::generate("generate_enum_variant"), "Generate variant", target, |builder| {
let mut editor = builder.make_editor(enum_node.syntax());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let field_list = parent.make_field_list(ctx, &make);
let variant = make.variant(None, make.name(&name_ref.text()), field_list, None);
if let Some(it) = enum_node.variant_list() {
diff --git a/crates/ide-assists/src/handlers/inline_local_variable.rs b/crates/ide-assists/src/handlers/inline_local_variable.rs
index f1a3f72..297a53a 100644
--- a/crates/ide-assists/src/handlers/inline_local_variable.rs
+++ b/crates/ide-assists/src/handlers/inline_local_variable.rs
@@ -91,7 +91,7 @@
}
}
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
for (name, should_wrap) in wrap_in_parens {
let replacement = if should_wrap {
diff --git a/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs b/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs
index 9c39a7a..37dc92b 100644
--- a/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs
+++ b/crates/ide-assists/src/handlers/introduce_named_type_parameter.rs
@@ -24,7 +24,7 @@
let fn_ = param.syntax().ancestors().nth(2).and_then(ast::Fn::cast)?;
let type_bound_list = impl_trait_type.type_bound_list()?;
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let target = fn_.syntax().text_range();
acc.add(
AssistId::refactor_rewrite("introduce_named_type_parameter"),
diff --git a/crates/ide-assists/src/handlers/remove_parentheses.rs b/crates/ide-assists/src/handlers/remove_parentheses.rs
index f5b3e00..9349c53 100644
--- a/crates/ide-assists/src/handlers/remove_parentheses.rs
+++ b/crates/ide-assists/src/handlers/remove_parentheses.rs
@@ -54,7 +54,7 @@
None => false,
};
if need_to_add_ws {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
editor.insert(Position::before(parens.syntax()), make.whitespace(" "));
editor.add_mappings(make.finish_with_mappings());
}
diff --git a/crates/ide-assists/src/handlers/replace_if_let_with_match.rs b/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
index 734bd17..2b356a1 100644
--- a/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
@@ -105,7 +105,7 @@
format!("Replace if{let_} with match"),
available_range,
move |builder| {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let match_expr = {
let else_arm = make_else_arm(ctx, &make, else_block, &cond_bodies);
let make_match_arm = |(pat, body): (_, ast::BlockExpr)| {
@@ -253,7 +253,7 @@
format!("Replace match with if{let_}"),
match_expr.syntax().text_range(),
move |builder| {
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let make_block_expr = |expr: ast::Expr| {
// Blocks with modifiers (unsafe, async, etc.) are parsed as BlockExpr, but are
// formatted without enclosing braces. If we encounter such block exprs,
diff --git a/crates/ide-assists/src/handlers/replace_let_with_if_let.rs b/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
index fd17231..c92a494 100644
--- a/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
@@ -43,7 +43,7 @@
target,
|builder| {
let mut editor = builder.make_editor(let_stmt.syntax());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let ty = ctx.sema.type_of_expr(&init);
let pat = if let_stmt.let_else().is_some() {
// Do not add the wrapper type that implements `Try`,
diff --git a/crates/ide-assists/src/handlers/unwrap_return_type.rs b/crates/ide-assists/src/handlers/unwrap_return_type.rs
index 8804fea..1c4c373 100644
--- a/crates/ide-assists/src/handlers/unwrap_return_type.rs
+++ b/crates/ide-assists/src/handlers/unwrap_return_type.rs
@@ -67,7 +67,7 @@
acc.add(kind.assist_id(), kind.label(), type_ref.syntax().text_range(), |builder| {
let mut editor = builder.make_editor(&parent);
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let mut exprs_to_unwrap = Vec::new();
let tail_cb = &mut |e: &_| tail_cb_impl(&mut exprs_to_unwrap, e);
diff --git a/crates/ide-assists/src/handlers/wrap_return_type.rs b/crates/ide-assists/src/handlers/wrap_return_type.rs
index a044068..64251ed 100644
--- a/crates/ide-assists/src/handlers/wrap_return_type.rs
+++ b/crates/ide-assists/src/handlers/wrap_return_type.rs
@@ -77,7 +77,7 @@
type_ref.syntax().text_range(),
|builder| {
let mut editor = builder.make_editor(&parent);
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let alias = wrapper_alias(ctx, &make, &core_wrapper, type_ref, kind.symbol());
let new_return_ty = alias.unwrap_or_else(|| match kind {
WrapperKind::Option => make.ty_option(type_ref.clone()),
diff --git a/crates/ide-completion/src/completions/pattern.rs b/crates/ide-completion/src/completions/pattern.rs
index 59ef94d..ea3511d 100644
--- a/crates/ide-completion/src/completions/pattern.rs
+++ b/crates/ide-completion/src/completions/pattern.rs
@@ -48,7 +48,7 @@
// Suggest name only in let-stmt and fn param
if pattern_ctx.should_suggest_name {
- let mut name_generator = suggest_name::NameGenerator::new();
+ let mut name_generator = suggest_name::NameGenerator::default();
if let Some(suggested) = ctx
.expected_type
.as_ref()
diff --git a/crates/ide-db/src/prime_caches/topologic_sort.rs b/crates/ide-db/src/prime_caches/topologic_sort.rs
index 7353d71..c8a0386 100644
--- a/crates/ide-db/src/prime_caches/topologic_sort.rs
+++ b/crates/ide-db/src/prime_caches/topologic_sort.rs
@@ -7,14 +7,20 @@
nodes: FxHashMap<T, Entry<T>>,
}
+// this implementation has different bounds on T than would be implied by #[derive(Default)]
+impl<T> Default for TopologicSortIterBuilder<T>
+where
+ T: Copy + Eq + PartialEq + Hash,
+{
+ fn default() -> Self {
+ Self { nodes: Default::default() }
+ }
+}
+
impl<T> TopologicSortIterBuilder<T>
where
T: Copy + Eq + PartialEq + Hash,
{
- fn new() -> Self {
- Self { nodes: Default::default() }
- }
-
fn get_or_create_entry(&mut self, item: T) -> &mut Entry<T> {
self.nodes.entry(item).or_default()
}
@@ -54,7 +60,7 @@
T: Copy + Eq + PartialEq + Hash,
{
pub(crate) fn builder() -> TopologicSortIterBuilder<T> {
- TopologicSortIterBuilder::new()
+ TopologicSortIterBuilder::default()
}
pub(crate) fn pending(&self) -> usize {
diff --git a/crates/ide-db/src/source_change.rs b/crates/ide-db/src/source_change.rs
index 741dc6b..b1b58d6 100644
--- a/crates/ide-db/src/source_change.rs
+++ b/crates/ide-db/src/source_change.rs
@@ -469,7 +469,7 @@
}
fn add_snippet_annotation(&mut self, kind: AnnotationSnippet) -> SyntaxAnnotation {
- let annotation = SyntaxAnnotation::new();
+ let annotation = SyntaxAnnotation::default();
self.snippet_annotations.push((kind, annotation));
self.source_change.is_snippet = true;
annotation
diff --git a/crates/ide-db/src/syntax_helpers/suggest_name.rs b/crates/ide-db/src/syntax_helpers/suggest_name.rs
index 6801856..51ce9b4 100644
--- a/crates/ide-db/src/syntax_helpers/suggest_name.rs
+++ b/crates/ide-db/src/syntax_helpers/suggest_name.rs
@@ -96,21 +96,16 @@
}
impl NameGenerator {
- /// Create a new empty generator
- pub fn new() -> Self {
- Self { pool: FxHashMap::default() }
- }
-
/// Create a new generator with existing names. When suggesting a name, it will
/// avoid conflicts with existing names.
pub fn new_with_names<'a>(existing_names: impl Iterator<Item = &'a str>) -> Self {
- let mut generator = Self::new();
+ let mut generator = Self::default();
existing_names.for_each(|name| generator.insert(name));
generator
}
pub fn new_from_scope_locals(scope: Option<SemanticsScope<'_>>) -> Self {
- let mut generator = Self::new();
+ let mut generator = Self::default();
if let Some(scope) = scope {
scope.process_all_names(&mut |name, scope| {
if let hir::ScopeDef::Local(_) = scope {
@@ -471,7 +466,7 @@
frange.range,
"selection is not an expression(yet contained in one)"
);
- let name = NameGenerator::new().for_variable(&expr, &sema);
+ let name = NameGenerator::default().for_variable(&expr, &sema);
assert_eq!(&name, expected);
}
@@ -1118,7 +1113,7 @@
#[test]
fn conflicts_with_existing_names() {
- let mut generator = NameGenerator::new();
+ let mut generator = NameGenerator::default();
assert_eq!(generator.suggest_name("a"), "a");
assert_eq!(generator.suggest_name("a"), "a1");
assert_eq!(generator.suggest_name("a"), "a2");
diff --git a/crates/ide-diagnostics/src/handlers/type_mismatch.rs b/crates/ide-diagnostics/src/handlers/type_mismatch.rs
index e1124c9..591213d 100644
--- a/crates/ide-diagnostics/src/handlers/type_mismatch.rs
+++ b/crates/ide-diagnostics/src/handlers/type_mismatch.rs
@@ -231,7 +231,7 @@
.and_then(Either::<ast::ReturnExpr, ast::StmtList>::cast)?;
editor = builder.make_editor(parent.syntax());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
match parent {
Either::Left(ret_expr) => {
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 8eca23e..7d855cf 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -238,7 +238,7 @@
file_set.insert(file_id, VfsPath::new_virtual_path("/main.rs".to_owned()));
let source_root = SourceRoot::new_local(file_set);
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
change.set_roots(vec![source_root]);
let mut crate_graph = CrateGraphBuilder::default();
// FIXME: cfg options
diff --git a/crates/intern/src/lib.rs b/crates/intern/src/lib.rs
index 6548bb1..e990490 100644
--- a/crates/intern/src/lib.rs
+++ b/crates/intern/src/lib.rs
@@ -177,7 +177,10 @@
map: OnceLock<InternMap<T>>,
}
-#[allow(clippy::new_without_default)] // this a const fn, so it can't be default
+#[allow(
+ clippy::new_without_default,
+ reason = "this a const fn, so it can't be default yet. See <https://github.com/rust-lang/rust/issues/63065>"
+)]
impl<T: ?Sized> InternStorage<T> {
pub const fn new() -> Self {
Self { map: OnceLock::new() }
diff --git a/crates/load-cargo/src/lib.rs b/crates/load-cargo/src/lib.rs
index c85eda7..c50e63d 100644
--- a/crates/load-cargo/src/lib.rs
+++ b/crates/load-cargo/src/lib.rs
@@ -426,7 +426,7 @@
) -> RootDatabase {
let lru_cap = std::env::var("RA_LRU_CAP").ok().and_then(|it| it.parse::<u16>().ok());
let mut db = RootDatabase::new(lru_cap);
- let mut analysis_change = ChangeWithProcMacros::new();
+ let mut analysis_change = ChangeWithProcMacros::default();
db.enable_proc_attr_macros();
diff --git a/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs b/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs
index 749a776..dfdbb4c 100644
--- a/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs
+++ b/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs
@@ -90,7 +90,7 @@
#[proc_macro_derive(DeriveEmpty)]
pub fn derive_empty(_item: TokenStream) -> TokenStream {
- TokenStream::new()
+ TokenStream::default()
}
#[proc_macro_derive(DerivePanic)]
diff --git a/crates/proc-macro-srv/src/proc_macros.rs b/crates/proc-macro-srv/src/proc_macros.rs
index 42474ab..1853270 100644
--- a/crates/proc-macro-srv/src/proc_macros.rs
+++ b/crates/proc-macro-srv/src/proc_macros.rs
@@ -26,7 +26,7 @@
let parsed_body = crate::server_impl::TokenStream::with_subtree(macro_body);
let parsed_attributes = attributes
- .map_or_else(crate::server_impl::TokenStream::new, |attr| {
+ .map_or_else(crate::server_impl::TokenStream::default, |attr| {
crate::server_impl::TokenStream::with_subtree(attr)
});
diff --git a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
index 6254018..1d845da 100644
--- a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
+++ b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
@@ -212,7 +212,7 @@
base: Option<Self::TokenStream>,
trees: Vec<bridge::TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,
) -> Self::TokenStream {
- let mut builder = TokenStreamBuilder::new();
+ let mut builder = TokenStreamBuilder::default();
if let Some(base) = base {
builder.push(base);
}
@@ -227,7 +227,7 @@
base: Option<Self::TokenStream>,
streams: Vec<Self::TokenStream>,
) -> Self::TokenStream {
- let mut builder = TokenStreamBuilder::new();
+ let mut builder = TokenStreamBuilder::default();
if let Some(base) = base {
builder.push(base);
}
diff --git a/crates/proc-macro-srv/src/server_impl/token_id.rs b/crates/proc-macro-srv/src/server_impl/token_id.rs
index d0c7f23..ca9d329 100644
--- a/crates/proc-macro-srv/src/server_impl/token_id.rs
+++ b/crates/proc-macro-srv/src/server_impl/token_id.rs
@@ -190,7 +190,7 @@
base: Option<Self::TokenStream>,
trees: Vec<bridge::TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,
) -> Self::TokenStream {
- let mut builder = TokenStreamBuilder::new();
+ let mut builder = TokenStreamBuilder::default();
if let Some(base) = base {
builder.push(base);
}
@@ -205,7 +205,7 @@
base: Option<Self::TokenStream>,
streams: Vec<Self::TokenStream>,
) -> Self::TokenStream {
- let mut builder = TokenStreamBuilder::new();
+ let mut builder = TokenStreamBuilder::default();
if let Some(base) = base {
builder.push(base);
}
diff --git a/crates/proc-macro-srv/src/server_impl/token_stream.rs b/crates/proc-macro-srv/src/server_impl/token_stream.rs
index a3cf76d..4946a4f 100644
--- a/crates/proc-macro-srv/src/server_impl/token_stream.rs
+++ b/crates/proc-macro-srv/src/server_impl/token_stream.rs
@@ -9,6 +9,13 @@
pub(super) token_trees: Vec<tt::TokenTree<S>>,
}
+// #[derive(Default)] would mean that `S: Default`.
+impl<S> Default for TokenStream<S> {
+ fn default() -> Self {
+ Self { token_trees: Default::default() }
+ }
+}
+
impl<S: std::fmt::Debug + Copy> std::fmt::Debug for TokenStream<S> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("TokenStream")
@@ -17,17 +24,7 @@
}
}
-impl<S> Default for TokenStream<S> {
- fn default() -> Self {
- Self { token_trees: vec![] }
- }
-}
-
impl<S: Copy> TokenStream<S> {
- pub(crate) fn new() -> Self {
- TokenStream::default()
- }
-
pub(crate) fn with_subtree(subtree: TopSubtree<S>) -> Self {
let delimiter_kind = subtree.top_subtree().delimiter.kind;
let mut token_trees = subtree.0;
@@ -145,10 +142,6 @@
}
impl<S: Copy> TokenStreamBuilder<S> {
- pub(super) fn new() -> TokenStreamBuilder<S> {
- TokenStreamBuilder { acc: TokenStream::new() }
- }
-
pub(super) fn push(&mut self, stream: TokenStream<S>) {
self.acc.token_trees.extend(stream.token_trees)
}
@@ -157,3 +150,9 @@
self.acc
}
}
+
+impl<S: Copy> Default for TokenStreamBuilder<S> {
+ fn default() -> Self {
+ Self { acc: TokenStream::default() }
+ }
+}
diff --git a/crates/rust-analyzer/src/cli/rustc_tests.rs b/crates/rust-analyzer/src/cli/rustc_tests.rs
index 62cbe85..c042c26 100644
--- a/crates/rust-analyzer/src/cli/rustc_tests.rs
+++ b/crates/rust-analyzer/src/cli/rustc_tests.rs
@@ -139,7 +139,7 @@
FxHashMap::default()
};
let text = read_to_string(&p).unwrap();
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
// Ignore unstable tests, since they move too fast and we do not intend to support all of them.
let mut ignore_test = text.contains("#![feature");
// Ignore test with extern crates, as this infra don't support them yet.
diff --git a/crates/rust-analyzer/src/cli/scip.rs b/crates/rust-analyzer/src/cli/scip.rs
index 1d27b05..d296788 100644
--- a/crates/rust-analyzer/src/cli/scip.rs
+++ b/crates/rust-analyzer/src/cli/scip.rs
@@ -128,7 +128,7 @@
};
// Generates symbols from token monikers.
- let mut symbol_generator = SymbolGenerator::new();
+ let mut symbol_generator = SymbolGenerator::default();
for StaticIndexedFile { file_id, tokens, .. } in si.files {
symbol_generator.clear_document_local_state();
@@ -417,16 +417,13 @@
is_inherent_impl: bool,
}
+#[derive(Default)]
struct SymbolGenerator {
token_to_symbols: FxHashMap<TokenId, Option<TokenSymbols>>,
local_count: usize,
}
impl SymbolGenerator {
- fn new() -> Self {
- SymbolGenerator { token_to_symbols: FxHashMap::default(), local_count: 0 }
- }
-
fn clear_document_local_state(&mut self) {
self.local_count = 0;
}
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index 6fc0ba9..820276e 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -299,7 +299,7 @@
FxHashMap::default();
let (change, modified_rust_files, workspace_structure_change) = {
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
let mut guard = self.vfs.write();
let changed_files = guard.0.take_changes();
if changed_files.is_empty() {
diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
index 4ad028e..49ebffa 100644
--- a/crates/rust-analyzer/src/integrated_benchmarks.rs
+++ b/crates/rust-analyzer/src/integrated_benchmarks.rs
@@ -86,7 +86,7 @@
"self.data.cargo_buildScripts_rebuildOnSave",
"self. data. cargo_buildScripts_rebuildOnSave",
);
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
change.change_file(file_id, Some(text));
host.apply_change(change);
}
@@ -149,7 +149,7 @@
let completion_offset =
patch(&mut text, "db.struct_data(self.id)", "sel;\ndb.struct_data(self.id)")
+ "sel".len();
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
change.change_file(file_id, Some(text));
host.apply_change(change);
completion_offset
@@ -200,7 +200,7 @@
let completion_offset =
patch(&mut text, "sel;\ndb.struct_data(self.id)", ";sel;\ndb.struct_data(self.id)")
+ ";sel".len();
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
change.change_file(file_id, Some(text));
host.apply_change(change);
completion_offset
@@ -250,7 +250,7 @@
let completion_offset =
patch(&mut text, "sel;\ndb.struct_data(self.id)", "self.;\ndb.struct_data(self.id)")
+ "self.".len();
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
change.change_file(file_id, Some(text));
host.apply_change(change);
completion_offset
@@ -367,7 +367,7 @@
let _it = stdx::timeit("change");
let mut text = host.analysis().file_text(file_id).unwrap().to_string();
patch(&mut text, "db.struct_data(self.id)", "();\ndb.struct_data(self.id)");
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
change.change_file(file_id, Some(text));
host.apply_change(change);
};
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 283b8f3..a80b995 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -739,7 +739,7 @@
ws_to_crate_graph(&self.workspaces, self.config.extra_env(None), load)
};
- let mut change = ChangeWithProcMacros::new();
+ let mut change = ChangeWithProcMacros::default();
if initial_build || !self.config.expand_proc_macros() {
if self.config.expand_proc_macros() {
change.set_proc_macros(
diff --git a/crates/stdx/src/anymap.rs b/crates/stdx/src/anymap.rs
index faf2e6c..0c39419 100644
--- a/crates/stdx/src/anymap.rs
+++ b/crates/stdx/src/anymap.rs
@@ -101,20 +101,15 @@
/// `Map::new()` doesn’t seem to be happy to infer that it should go with the default
/// value. It’s a bit sad, really. Ah well, I guess this approach will do.
pub type AnyMap = Map<dyn Any>;
+
impl<A: ?Sized + Downcast> Default for Map<A> {
#[inline]
fn default() -> Map<A> {
- Map::new()
+ Map { raw: RawMap::with_hasher(Default::default()) }
}
}
impl<A: ?Sized + Downcast> Map<A> {
- /// Create an empty collection.
- #[inline]
- pub fn new() -> Map<A> {
- Map { raw: RawMap::with_hasher(Default::default()) }
- }
-
/// Returns a reference to the value stored in the collection for the type `T`,
/// if it exists.
#[inline]
diff --git a/crates/syntax/src/ast/syntax_factory.rs b/crates/syntax/src/ast/syntax_factory.rs
index 1c517ac..7142e4f 100644
--- a/crates/syntax/src/ast/syntax_factory.rs
+++ b/crates/syntax/src/ast/syntax_factory.rs
@@ -19,8 +19,8 @@
impl SyntaxFactory {
/// Creates a new [`SyntaxFactory`], generating mappings between input nodes and generated nodes.
- pub fn new() -> Self {
- Self { mappings: Some(RefCell::new(SyntaxMapping::new())) }
+ pub fn with_mappings() -> Self {
+ Self { mappings: Some(RefCell::new(SyntaxMapping::default())) }
}
/// Creates a [`SyntaxFactory`] without generating mappings.
diff --git a/crates/syntax/src/syntax_editor.rs b/crates/syntax/src/syntax_editor.rs
index 15515dd..473d9c0 100644
--- a/crates/syntax/src/syntax_editor.rs
+++ b/crates/syntax/src/syntax_editor.rs
@@ -33,7 +33,7 @@
impl SyntaxEditor {
/// Creates a syntax editor to start editing from `root`
pub fn new(root: SyntaxNode) -> Self {
- Self { root, changes: vec![], mappings: SyntaxMapping::new(), annotations: vec![] }
+ Self { root, changes: vec![], mappings: SyntaxMapping::default(), annotations: vec![] }
}
pub fn add_annotation(&mut self, element: impl Element, annotation: SyntaxAnnotation) {
@@ -151,9 +151,8 @@
#[repr(transparent)]
pub struct SyntaxAnnotation(NonZeroU32);
-impl SyntaxAnnotation {
- /// Creates a unique syntax annotation to attach data to.
- pub fn new() -> Self {
+impl Default for SyntaxAnnotation {
+ fn default() -> Self {
static COUNTER: AtomicU32 = AtomicU32::new(1);
// Only consistency within a thread matters, as SyntaxElements are !Send
@@ -163,12 +162,6 @@
}
}
-impl Default for SyntaxAnnotation {
- fn default() -> Self {
- Self::new()
- }
-}
-
/// Position describing where to insert elements
#[derive(Debug)]
pub struct Position {
@@ -411,12 +404,12 @@
let to_replace = root.syntax().descendants().find_map(ast::BinExpr::cast).unwrap();
let mut editor = SyntaxEditor::new(root.syntax().clone());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let name = make::name("var_name");
let name_ref = make::name_ref("var_name").clone_for_update();
- let placeholder_snippet = SyntaxAnnotation::new();
+ let placeholder_snippet = SyntaxAnnotation::default();
editor.add_annotation(name.syntax(), placeholder_snippet);
editor.add_annotation(name_ref.syntax(), placeholder_snippet);
@@ -522,7 +515,7 @@
let second_let = root.syntax().descendants().find_map(ast::LetStmt::cast).unwrap();
let mut editor = SyntaxEditor::new(root.syntax().clone());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let new_block_expr = make.block_expr([], Some(ast::Expr::BlockExpr(inner_block.clone())));
@@ -574,7 +567,7 @@
let inner_block = root.clone();
let mut editor = SyntaxEditor::new(root.syntax().clone());
- let make = SyntaxFactory::new();
+ let make = SyntaxFactory::with_mappings();
let new_block_expr = make.block_expr([], Some(ast::Expr::BlockExpr(inner_block.clone())));
diff --git a/crates/syntax/src/syntax_editor/mapping.rs b/crates/syntax/src/syntax_editor/mapping.rs
index f71925a..1eaef03 100644
--- a/crates/syntax/src/syntax_editor/mapping.rs
+++ b/crates/syntax/src/syntax_editor/mapping.rs
@@ -20,10 +20,6 @@
}
impl SyntaxMapping {
- pub fn new() -> Self {
- Self::default()
- }
-
/// Like [`SyntaxMapping::upmap_child`] but for syntax elements.
pub fn upmap_child_element(
&self,
diff --git a/crates/test-fixture/src/lib.rs b/crates/test-fixture/src/lib.rs
index 0509a39..059397b 100644
--- a/crates/test-fixture/src/lib.rs
+++ b/crates/test-fixture/src/lib.rs
@@ -139,7 +139,7 @@
let channel = toolchain.as_deref().unwrap_or("stable");
Version::parse(&format!("1.76.0-{channel}")).unwrap()
});
- let mut source_change = FileChange::new();
+ let mut source_change = FileChange::default();
let mut files = Vec::new();
let mut crate_graph = CrateGraphBuilder::default();
diff --git a/xtask/src/publish/notes.rs b/xtask/src/publish/notes.rs
index 7245ce2..93592d4 100644
--- a/xtask/src/publish/notes.rs
+++ b/xtask/src/publish/notes.rs
@@ -85,7 +85,7 @@
}
fn process_list(&mut self) -> anyhow::Result<()> {
- let mut nesting = ListNesting::new();
+ let mut nesting = ListNesting::default();
while let Some(line) = self.iter.peek() {
let line = line.as_deref().map_err(|e| anyhow!("{e}"))?;
@@ -385,10 +385,6 @@
struct ListNesting(Vec<ListMarker>);
impl ListNesting {
- fn new() -> Self {
- Self(Vec::<ListMarker>::with_capacity(6))
- }
-
fn current(&mut self) -> Option<&ListMarker> {
self.0.last()
}
@@ -417,6 +413,12 @@
}
}
+impl Default for ListNesting {
+ fn default() -> Self {
+ Self(Vec::<ListMarker>::with_capacity(6))
+ }
+}
+
#[derive(Debug, PartialEq, Eq)]
enum ListMarker {
Asterisk(usize),
