Skip to content

Commit

Permalink
fix: clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
can-keklik committed Dec 15, 2024
1 parent 0ea41c4 commit e7454f5
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 24 deletions.
8 changes: 7 additions & 1 deletion lykiadb-lang/benches/parsing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ pub struct ParserBenchmark {
locals: Locals,
}

impl Default for ParserBenchmark {
fn default() -> Self {
Self::new()
}
}

impl ParserBenchmark {
pub fn new() -> ParserBenchmark {
ParserBenchmark {
Expand Down Expand Up @@ -60,7 +66,7 @@ fn runtime() {

fn bench(c: &mut Criterion) {
let mut group = c.benchmark_group("sample-size-example");
group.bench_function("2-way join", |b| b.iter(|| runtime()));
group.bench_function("2-way join", |b| b.iter(runtime));
group.finish();
}

Expand Down
2 changes: 1 addition & 1 deletion lykiadb-lang/src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ macro_rules! optional_with_expected {
};
}

impl<'a> Parser<'a> {
impl Parser<'_> {
fn sql_insert(&mut self) -> ParseResult<Box<Expr>> {
if !self.match_next(&skw!(Insert)) {
return self.sql_update();
Expand Down
8 changes: 2 additions & 6 deletions lykiadb-lang/src/parser/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ impl<'a> Resolver<'a> {
) -> Resolver<'a> {
Resolver {
scopes,
locals: if let Some(previous_locals) = previous_locals {
previous_locals
} else {
FxHashMap::default()
},
locals: previous_locals.unwrap_or_default(),
program,
}
}
Expand Down Expand Up @@ -91,7 +87,7 @@ impl<'a> Resolver<'a> {
}
}

impl<'a> VisitorMut<(), ResolveError> for Resolver<'a> {
impl VisitorMut<(), ResolveError> for Resolver<'_> {
fn visit_expr(&mut self, e: &Expr) -> Result<(), ResolveError> {
match e {
Expr::Literal { value, .. } => match value {
Expand Down
2 changes: 1 addition & 1 deletion lykiadb-lang/src/tokenizer/scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub enum ScanError {
MalformedNumberLiteral { span: Span },
}

impl<'a> Scanner<'a> {
impl Scanner<'_> {
pub fn scan(source: &str) -> Result<Vec<Token>, ScanError> {
let mut scanner = Scanner {
chars: source.chars().enumerate().peekable(),
Expand Down
2 changes: 1 addition & 1 deletion lykiadb-server/src/engine/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ pub fn report_error(
}
#[cfg(test)]
mod tests {
use core::panic;


use super::*;
use lykiadb_lang::{
Expand Down
8 changes: 4 additions & 4 deletions lykiadb-server/src/engine/interpreter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ impl LoopStack {
if self.is_loops_empty() {
return None;
}
return self.ongoing_loops.last();
self.ongoing_loops.last()
}

pub fn set_last_loop(&mut self, to: LoopState) {
Expand Down Expand Up @@ -259,13 +259,13 @@ impl Interpreter {
self.env_man.read().unwrap().read_at(
self.env,
unwrapped,
&name,
name,
&self.interner.get_or_intern(name),
)
} else {
self.env_man.read().unwrap().read(
self.root_env,
&name,
name,
&self.interner.get_or_intern(name),
)
}
Expand All @@ -283,7 +283,7 @@ impl Interpreter {

for (i, param) in parameters.iter().enumerate() {
// TODO: Remove clone here
write_guard.declare(fn_env, param.clone(), arguments.get(i).unwrap().clone());
write_guard.declare(fn_env, *param, arguments.get(i).unwrap().clone());
}

drop(write_guard);
Expand Down
2 changes: 1 addition & 1 deletion lykiadb-server/src/engine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub mod test_helpers {
.split(',')
.map(|flag| {
let kv: Vec<&str> = flag.split('=').collect();
return (kv[0].trim(), kv[1].trim());
(kv[0].trim(), kv[1].trim())
})
.fold(std::collections::HashMap::new(), |mut acc, (k, v)| {
acc.insert(k, v);
Expand Down
2 changes: 1 addition & 1 deletion lykiadb-server/src/value/callable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl Function {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
match self {
Function::Stateful(_) | Function::Lambda { .. } => write!(f, "<native_fn>"),
Function::UserDefined { name, .. } => write!(f, "{}", "<user_defined_fn>"),
Function::UserDefined { .. } => write!(f, "<user_defined_fn>"),
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions lykiadb-server/src/value/environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use core::panic;
use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use std::borrow::{Borrow, BorrowMut};
use string_interner::{symbol::SymbolU32, StringInterner, Symbol};
use string_interner::symbol::SymbolU32;

use super::RV;

Expand Down Expand Up @@ -191,7 +191,7 @@ mod test {
env_man.declare(env, interner.get_or_intern("five"), RV::Num(5.0));
assert_eq!(
env_man
.read(env, &"five", &interner.get_or_intern("five"))
.read(env, "five", &interner.get_or_intern("five"))
.unwrap(),
RV::Num(5.0)
);
Expand All @@ -206,7 +206,7 @@ mod test {
let child = env_man.push(Some(parent));
assert_eq!(
env_man
.read(child, &"five", &interner.get_or_intern("five"))
.read(child, "five", &interner.get_or_intern("five"))
.unwrap(),
RV::Num(5.0)
);
Expand All @@ -220,17 +220,17 @@ mod test {
env_man.declare(parent, interner.get_or_intern("five"), RV::Num(5.0));
let child = env_man.push(Some(parent));
env_man
.assign(child, &"five", interner.get_or_intern("five"), RV::Num(5.1))
.assign(child, "five", interner.get_or_intern("five"), RV::Num(5.1))
.unwrap();
assert_eq!(
env_man
.read(parent, &"five", &interner.get_or_intern("five"))
.read(parent, "five", &interner.get_or_intern("five"))
.unwrap(),
RV::Num(5.1)
);
assert_eq!(
env_man
.read(child, &"five", &interner.get_or_intern("five"))
.read(child, "five", &interner.get_or_intern("five"))
.unwrap(),
RV::Num(5.1)
);
Expand All @@ -242,7 +242,7 @@ mod test {
let mut interner = get_interner();
let env = env_man.top();
assert!(env_man
.read(env, &"five", &interner.get_or_intern("five"))
.read(env, "five", &interner.get_or_intern("five"))
.is_err());
}

Expand All @@ -252,7 +252,7 @@ mod test {
let mut interner = get_interner();
let env = env_man.top();
assert!(env_man
.assign(env, &"five", interner.get_or_intern("five"), RV::Num(5.0))
.assign(env, "five", interner.get_or_intern("five"), RV::Num(5.0))
.is_err());
}
}

0 comments on commit e7454f5

Please sign in to comment.