Skip to content

Commit 0076174

Browse files
committed
fix: clippy warnings
1 parent 48d0dd3 commit 0076174

7 files changed

Lines changed: 11 additions & 7 deletions

File tree

crates/els/completion.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,10 @@ fn module_item(name: &str, mistype: bool, insert: Option<u32>) -> CompletionItem
255255
// => `datetime = pyimport "datetime"`
256256
if let Some(line) = insert {
257257
let prefix = if mistype { "py" } else { "" };
258-
let import = format!("{} = {prefix}", name.split('/').last().unwrap_or("module"));
258+
let import = format!(
259+
"{} = {prefix}",
260+
name.split('/').next_back().unwrap_or("module")
261+
);
259262
item.additional_text_edits = Some(vec![TextEdit {
260263
range: Range::new(Position::new(line - 1, 0), Position::new(line - 1, 0)),
261264
new_text: import,

crates/els/hir_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<'a> HIRVisitor<'a> {
107107
.uri
108108
.path()
109109
.split('/')
110-
.last()
110+
.next_back()
111111
.unwrap_or_default()
112112
.split('.')
113113
.next()

crates/erg_common/io.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ impl Input {
394394
dir.set_extension("er"); // {path/to}.er
395395
let path = dir.canonicalize().or_else(|_| {
396396
dir.pop(); // {path}
397-
dir.push(path.iter().last().unwrap_or_default()); // {path/to}
397+
dir.push(path.iter().next_back().unwrap_or_default()); // {path/to}
398398
dir.push("__init__.er"); // -> {path/to}/__init__.er
399399
dir.canonicalize()
400400
})?;

crates/erg_common/pathutil.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ pub fn mod_name(path: &Path) -> Str {
287287
.next()
288288
.unwrap()
289289
.split('/')
290-
.last()
290+
.next_back()
291291
.unwrap();
292292
let sub = path
293293
.split("/src/")

crates/erg_compiler/module/promise.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ impl SharedPromises {
242242
for promise in self.promises.borrow().values() {
243243
match promise {
244244
Promise::Running { .. } => running += 1,
245-
Promise::Joined { .. } => finished += 1,
245+
Promise::Joined => finished += 1,
246246
}
247247
total += 1;
248248
}

crates/erg_compiler/ty/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1728,7 +1728,7 @@ impl LimitedDisplay for Type {
17281728
name.trim_matches('\"')
17291729
.trim_end_matches('/')
17301730
.split('/')
1731-
.last()
1731+
.next_back()
17321732
.unwrap()
17331733
)?;
17341734
return Ok(());

crates/erg_compiler/ty/value.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,8 @@ impl ValueObj {
14021402
}
14031403
if content.len() >= 3 && content.get(content.len() - 3..) == Some("\"\"\"") {
14041404
content = Str::rc(&content[..content.len() - 3]);
1405-
} else if content.len() >= 1 && content.get(content.len() - 1..) == Some("\"") {
1405+
} else if !content.is_empty() && content.get(content.len() - 1..) == Some("\"")
1406+
{
14061407
content = Str::rc(&content[..content.len() - 1]);
14071408
}
14081409
Some(Self::Str(content))

0 commit comments

Comments
 (0)