Skip to content

Commit c52277f

Browse files
CppCXYCppCXY
committed
clean code use clippy
1 parent d9f9ef2 commit c52277f

File tree

34 files changed

+168
-212
lines changed

34 files changed

+168
-212
lines changed

‎crates/emmylua_check/src/init.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn load_workspace(
1717
analysis.add_main_workspace(path.clone());
1818
}
1919

20-
let main_path = workspace_folders.get(0)?.clone();
20+
let main_path = workspace_folders.first()?.clone();
2121
let (config_files, config_root) = if let Some(config_path) = config_path {
2222
(
2323
vec![config_path.clone()],
@@ -85,7 +85,7 @@ pub fn collect_files(
8585

8686
for workspace in workspaces {
8787
let loaded = load_workspace_files(
88-
&workspace,
88+
workspace,
8989
&match_pattern,
9090
&exclude,
9191
&exclude_dir,

‎crates/emmylua_check/src/output/text_output_writer.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ impl OutputWriter for TextOutputWriter {
3535
let mut warning_count = 0;
3636
let mut advice_count = 0;
3737
for diagnostic in &diagnostics {
38-
match diagnostic.severity {
39-
Some(severity) => match severity {
38+
if let Some(severity) = diagnostic.severity {
39+
match severity {
4040
lsp_types::DiagnosticSeverity::ERROR => {
4141
error_count += 1;
4242
}
@@ -46,8 +46,7 @@ impl OutputWriter for TextOutputWriter {
4646
_ => {
4747
advice_count += 1;
4848
}
49-
},
50-
_ => {}
49+
}
5150
}
5251
}
5352

‎crates/emmylua_doc_cli/src/init.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ pub fn load_workspace(workspace_folders: Vec<&str>) -> Option<EmmyLuaAnalysis> {
1111

1212
let mut workspace_folders = workspace_folders
1313
.iter()
14-
.map(|s| PathBuf::from(s))
14+
.map(PathBuf::from)
1515
.collect::<Vec<_>>();
1616
for path in &workspace_folders {
1717
analysis.add_main_workspace(path.clone());
1818
}
1919

20-
let main_path = workspace_folders.get(0)?.clone();
20+
let main_path = workspace_folders.first()?.clone();
2121
let config_files = vec![
2222
main_path.join(".luarc.json"),
2323
main_path.join(".emmyrc.json"),
@@ -59,7 +59,7 @@ pub fn collect_files(workspaces: &Vec<PathBuf>, emmyrc: &Emmyrc) -> Vec<LuaFileI
5959
);
6060
for workspace in workspaces {
6161
let loaded = load_workspace_files(
62-
&workspace,
62+
workspace,
6363
&match_pattern,
6464
&exclude,
6565
&exclude_dir,

‎crates/emmylua_doc_cli/src/markdown_generator/gen/global_gen.rs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ pub fn generate_global_markdown(
3232
doc.name = name.to_string();
3333
doc.property = collect_property(db, LuaSemanticDeclId::LuaDecl(decl.get_id()));
3434

35-
let decl_type = db
36-
.get_type_index()
37-
.get_type_cache(&decl_id.clone().into())?;
35+
let decl_type = db.get_type_index().get_type_cache(&(*decl_id).into())?;
3836
let mut template_name = "lua_global_template.tl";
3937
match decl_type.as_type() {
4038
LuaType::TableConst(table) => {
@@ -48,15 +46,15 @@ pub fn generate_global_markdown(
4846
}
4947
context.insert("doc", &doc);
5048

51-
let render_text = match tl.render(&template_name, &context) {
49+
let render_text = match tl.render(template_name, &context) {
5250
Ok(text) => text,
5351
Err(e) => {
5452
eprintln!("Failed to render template: {}", e);
5553
return None;
5654
}
5755
};
5856

59-
let file_name = format!("{}.md", escape_type_name(&decl.get_name()));
57+
let file_name = format!("{}.md", escape_type_name(decl.get_name()));
6058
mkdocs_index.globals.push(IndexStruct {
6159
name: decl.get_name().to_string(),
6260
file: format!("globals/{}", file_name.clone()),
@@ -80,9 +78,7 @@ fn check_filter(db: &DbIndex, decl_id: &LuaDeclId) -> Option<()> {
8078
if !module.workspace_id.is_main() {
8179
return None;
8280
};
83-
let decl_type = db
84-
.get_type_index()
85-
.get_type_cache(&decl_id.clone().into())?;
81+
let decl_type = db.get_type_index().get_type_cache(&(*decl_id).into())?;
8682
match decl_type.as_type() {
8783
LuaType::Ref(_) | LuaType::Def(_) => return None,
8884
_ => {}
@@ -96,18 +92,16 @@ fn generate_simple_global(db: &DbIndex, decl: &LuaDecl, doc: &mut Doc) -> Option
9692
doc.property = collect_property(db, semantic_decl);
9793

9894
let name = decl.get_name();
99-
let ty = db
100-
.get_type_index()
101-
.get_type_cache(&decl.get_id().clone().into())?;
95+
let ty = db.get_type_index().get_type_cache(&decl.get_id().into())?;
10296
if ty.is_function() {
103-
let display = render_function_type(db, ty, &name, false);
97+
let display = render_function_type(db, ty, name, false);
10498
doc.display = Some(display);
10599
} else if ty.is_const() {
106-
let typ_display = render_const_type(db, &ty);
100+
let typ_display = render_const_type(db, ty);
107101
let display = format!("```lua\n{}: {}\n```\n", name, typ_display);
108102
doc.display = Some(display);
109103
} else {
110-
let typ_display = humanize_type(db, &ty, RenderLevel::Detailed);
104+
let typ_display = humanize_type(db, ty, RenderLevel::Detailed);
111105
let display = format!("```lua\n{} : {}\n```\n", name, typ_display);
112106
doc.display = Some(display);
113107
}

‎crates/emmylua_doc_cli/src/markdown_generator/gen/mod_gen.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub fn generate_member_owner_module(
105105
.unwrap_or(&LuaTypeCache::InferType(LuaType::Unknown))
106106
.as_type();
107107
let member_id = member.get_id();
108-
let member_property_id = LuaSemanticDeclId::Member(member_id.clone());
108+
let member_property_id = LuaSemanticDeclId::Member(member_id);
109109
let member_property = db.get_property_index().get_property(&member_property_id);
110110
if let Some(member_property) = member_property {
111111
if member_property.visibility.unwrap_or(VisibilityKind::Public)
@@ -125,21 +125,21 @@ pub fn generate_member_owner_module(
125125
let title_name = format!("{}.{}", owner_name, name);
126126
if member_type.is_function() {
127127
let func_name = format!("{}.{}", owner_name, name);
128-
let display = render_function_type(db, &member_type, &func_name, false);
128+
let display = render_function_type(db, member_type, &func_name, false);
129129
method_members.push(MemberDoc {
130130
name: title_name,
131131
display,
132132
property: member_property,
133133
});
134134
} else if member_type.is_const() {
135-
let display = render_const_type(db, &member_type);
135+
let display = render_const_type(db, member_type);
136136
field_members.push(MemberDoc {
137137
name: title_name,
138138
display: format!("```lua\n{}.{}: {}\n```\n", owner_name, name, display),
139139
property: member_property,
140140
});
141141
} else {
142-
let typ_display = humanize_type(db, &member_type, RenderLevel::Detailed);
142+
let typ_display = humanize_type(db, member_type, RenderLevel::Detailed);
143143
field_members.push(MemberDoc {
144144
name: title_name,
145145
display: format!("```lua\n{}.{} : {}\n```\n", owner_name, name, typ_display),

‎crates/emmylua_doc_cli/src/markdown_generator/gen/typ_gen.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fn generate_class_type_markdown(
9191
.unwrap_or(&LuaTypeCache::InferType(LuaType::Unknown))
9292
.as_type();
9393
let member_id = member.get_id();
94-
let member_property_id = LuaSemanticDeclId::Member(member_id.clone());
94+
let member_property_id = LuaSemanticDeclId::Member(member_id);
9595
let member_property = db.get_property_index().get_property(&member_property_id);
9696
if let Some(member_property) = member_property {
9797
if member_property.visibility.unwrap_or(VisibilityKind::Public)
@@ -113,14 +113,14 @@ fn generate_class_type_markdown(
113113
let title_name = format!("{}.{}", typ_name, name);
114114
if member_typ.is_function() {
115115
let func_name = format!("{}.{}", typ_name, name);
116-
let display = render_function_type(db, &member_typ, &func_name, false);
116+
let display = render_function_type(db, member_typ, &func_name, false);
117117
method_members.push(MemberDoc {
118118
name: title_name,
119119
display,
120120
property: member_property,
121121
});
122122
} else if member_typ.is_const() {
123-
let const_type_display = render_const_type(db, &member_typ);
123+
let const_type_display = render_const_type(db, member_typ);
124124
field_members.push(MemberDoc {
125125
name: title_name,
126126
display: format!(
@@ -130,7 +130,7 @@ fn generate_class_type_markdown(
130130
property: member_property,
131131
});
132132
} else {
133-
let typ_display = humanize_type(db, &member_typ, RenderLevel::Detailed);
133+
let typ_display = humanize_type(db, member_typ, RenderLevel::Detailed);
134134
field_members.push(MemberDoc {
135135
name: title_name,
136136
display: format!("```lua\n{}.{} : {}\n```\n", typ_name, name, typ_display),
@@ -148,7 +148,7 @@ fn generate_class_type_markdown(
148148
}
149149

150150
context.insert("doc", &doc);
151-
let render_text = match tl.render("lua_type_template.tl", &context) {
151+
let render_text = match tl.render("lua_type_template.tl", context) {
152152
Ok(text) => text,
153153
Err(e) => {
154154
eprintln!("Failed to render template: {}", e);
@@ -202,7 +202,7 @@ fn generate_enum_type_markdown(
202202
.unwrap_or(&LuaTypeCache::InferType(LuaType::Unknown))
203203
.as_type();
204204
let member_id = member.get_id();
205-
let member_property_id = LuaSemanticDeclId::Member(member_id.clone());
205+
let member_property_id = LuaSemanticDeclId::Member(member_id);
206206
let member_property = db.get_property_index().get_property(&member_property_id);
207207
if let Some(member_property) = member_property {
208208
if member_property.visibility.unwrap_or(VisibilityKind::Public)
@@ -220,7 +220,7 @@ fn generate_enum_type_markdown(
220220
_ => continue,
221221
};
222222

223-
let typ_display = humanize_type(db, &member_typ, RenderLevel::Simple);
223+
let typ_display = humanize_type(db, member_typ, RenderLevel::Simple);
224224
field_members.push(MemberDoc {
225225
name: name.to_string(),
226226
display: typ_display,
@@ -234,7 +234,7 @@ fn generate_enum_type_markdown(
234234
}
235235

236236
context.insert("doc", &doc);
237-
let render_text = match tl.render("lua_enum_template.tl", &context) {
237+
let render_text = match tl.render("lua_enum_template.tl", context) {
238238
Ok(text) => text,
239239
Err(e) => {
240240
eprintln!("Failed to render template: {}", e);
@@ -290,7 +290,7 @@ fn generate_alias_type_markdown(
290290

291291
context.insert("doc", &doc);
292292

293-
let render_text = match tl.render("lua_alias_template.tl", &context) {
293+
let render_text = match tl.render("lua_alias_template.tl", context) {
294294
Ok(text) => text,
295295
Err(e) => {
296296
eprintln!("Failed to render template: {}", e);

‎crates/emmylua_doc_cli/src/markdown_generator/render.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub fn render_function_type(
3333
render_doc_function_type(db, lua_func, func_name, is_local)
3434
}
3535
LuaType::Signature(signature_id) => {
36-
render_signature_type(db, signature_id.clone(), func_name, is_local).unwrap_or(format!(
36+
render_signature_type(db, *signature_id, func_name, is_local).unwrap_or(format!(
3737
"{}function {}",
3838
if is_local { "local " } else { "" },
3939
func_name
@@ -82,23 +82,23 @@ fn render_doc_function_type(
8282
result.push_str(local_prev);
8383
result.push_str("function ");
8484
result.push_str(func_name);
85-
result.push_str("(");
85+
result.push('(');
8686
if params.len() > 1 {
87-
result.push_str("\n");
87+
result.push('\n');
8888
for param in &params {
8989
result.push_str(" ");
9090
result.push_str(param);
9191
result.push_str(",\n");
9292
}
9393
result.pop(); // Remove the last comma
9494
result.pop(); // Remove the last newline
95-
result.push_str("\n");
95+
result.push('\n');
9696
} else {
9797
result.push_str(&params.join(", "));
9898
}
99-
result.push_str(")");
99+
result.push(')');
100100
if ret_strs.len() > 15 {
101-
result.push_str("\n");
101+
result.push('\n');
102102
}
103103

104104
if !ret_strs.is_empty() {
@@ -144,21 +144,21 @@ fn render_signature_type(
144144
result.push_str(local_prev);
145145
result.push_str("function ");
146146
result.push_str(func_name);
147-
result.push_str("(");
147+
result.push('(');
148148
if params.len() > 1 {
149-
result.push_str("\n");
149+
result.push('\n');
150150
for param in &params {
151151
result.push_str(" ");
152152
result.push_str(param);
153153
result.push_str(",\n");
154154
}
155155
result.pop(); // Remove the last comma
156156
result.pop(); // Remove the last newline
157-
result.push_str("\n");
157+
result.push('\n');
158158
} else {
159159
result.push_str(&params.join(", "));
160160
}
161-
result.push_str(")");
161+
result.push(')');
162162
match rets.len() {
163163
0 => {}
164164
1 => {
@@ -168,7 +168,7 @@ fn render_signature_type(
168168
result.push_str(format!("{} {}", name, type_text).as_str());
169169
}
170170
_ => {
171-
result.push_str("\n");
171+
result.push('\n');
172172
for ret in rets {
173173
let type_text = render_typ(db, &ret.type_ref);
174174
let name = ret.name.clone().unwrap_or("".to_string());
@@ -191,7 +191,7 @@ fn render_signature_type(
191191
result.push_str("\n\n");
192192
}
193193
}
194-
result.push_str("\n");
194+
result.push('\n');
195195
for ret in rets {
196196
if let Some(description) = &ret.description {
197197
let name = match ret.name {
@@ -204,7 +204,7 @@ fn render_signature_type(
204204
}
205205
}
206206

207-
result.push_str("\n");
207+
result.push('\n');
208208

209209
Some(result)
210210
}

‎crates/emmylua_parser/src/grammar/lua/expr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
use super::{expect_token, if_token_bump, parse_block};
1010

1111
pub fn parse_expr(p: &mut LuaParser) -> ParseResult {
12-
return parse_sub_expr(p, 0);
12+
parse_sub_expr(p, 0)
1313
}
1414

1515
fn parse_sub_expr(p: &mut LuaParser, limit: i32) -> ParseResult {

‎crates/emmylua_parser/src/kind/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ impl From<LuaTokenKind> for LuaKind {
3535
}
3636
}
3737

38-
impl Into<LuaSyntaxKind> for LuaKind {
39-
fn into(self) -> LuaSyntaxKind {
40-
match self {
38+
impl From<LuaKind> for LuaSyntaxKind {
39+
fn from(val: LuaKind) -> Self {
40+
match val {
4141
LuaKind::Syntax(kind) => kind,
4242
_ => LuaSyntaxKind::None,
4343
}
4444
}
4545
}
4646

47-
impl Into<LuaTokenKind> for LuaKind {
48-
fn into(self) -> LuaTokenKind {
49-
match self {
47+
impl From<LuaKind> for LuaTokenKind {
48+
fn from(val: LuaKind) -> Self {
49+
match val {
5050
LuaKind::Token(kind) => kind,
5151
_ => LuaTokenKind::None,
5252
}

0 commit comments

Comments
 (0)