Skip to content

Commit 9833189

Browse files
committed
Fix clippy warnings
1 parent 6f77eba commit 9833189

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

src/agent/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl Capabilities {
5151
pub fn for_agent(db: &Database, agent: &str) -> Fallible<Self> {
5252
let caps = db.query(
5353
"SELECT capability FROM agent_capabilities WHERE agent_name = ?1",
54-
&[&agent],
54+
[&agent],
5555
|r| r.get::<_, String>(0),
5656
)?;
5757

@@ -153,7 +153,7 @@ fn run_experiment(
153153
db: &ResultsUploader,
154154
threads_count: usize,
155155
past_experiment: &mut Option<String>,
156-
) -> Result<(), (Option<Experiment>, Error)> {
156+
) -> Result<(), (Option<Box<Experiment>>, Error)> {
157157
let ex = agent.experiment().map_err(|e| (None, e))?;
158158

159159
if Some(&ex.name) != past_experiment.as_ref() {
@@ -177,7 +177,7 @@ fn run_experiment(
177177
crate::runner::run_ex(&ex, workspace, db, threads_count, &agent.config, &|| {
178178
agent.next_crate(&ex.name)
179179
})
180-
.map_err(|err| (Some(ex), err))?;
180+
.map_err(|err| (Some(Box::new(ex)), err))?;
181181
Ok(())
182182
}
183183

src/crates/lists.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub(crate) trait List {
4848
fn get(db: &Database) -> Fallible<Vec<Crate>> {
4949
let crates_results = db.query(
5050
"SELECT crate FROM crates WHERE list = ?1 ORDER BY rowid;",
51-
&[&Self::NAME],
51+
[&Self::NAME],
5252
|r| r.get::<_, String>(0),
5353
)?;
5454

src/db/migrations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ pub fn execute(db: &mut Connection) -> Fallible<()> {
408408
}
409409
.with_context(|_| format!("error running migration: {}", name))?;
410410

411-
t.execute("INSERT INTO migrations (name) VALUES (?1)", &[&name])?;
411+
t.execute("INSERT INTO migrations (name) VALUES (?1)", [&name])?;
412412
t.commit()?;
413413

414414
info!("executed migration: {}", name);

src/experiments.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ impl Experiment {
268268
pub fn unfinished(db: &Database) -> Fallible<Vec<Experiment>> {
269269
let records = db.query(
270270
"SELECT * FROM experiments WHERE status != ?1 ORDER BY priority DESC, created_at;",
271-
&[&Status::Completed.to_str()],
271+
[&Status::Completed.to_str()],
272272
|r| ExperimentDBRecord::from_row(r),
273273
)?;
274274
records
@@ -283,7 +283,7 @@ impl Experiment {
283283
select latest_work_for from agents where ('agent:' || agents.name) = ?1
284284
) and status = ?2 \
285285
limit 1",
286-
&[&assignee.to_string(), Status::Running.to_str()],
286+
[&assignee.to_string(), Status::Running.to_str()],
287287
|r| ExperimentDBRecord::from_row(r),
288288
)?;
289289

@@ -483,7 +483,7 @@ impl Experiment {
483483
pub fn get(db: &Database, name: &str) -> Fallible<Option<Experiment>> {
484484
let record = db.get_row(
485485
"SELECT * FROM experiments WHERE name = ?1;",
486-
&[&name],
486+
[&name],
487487
|r| ExperimentDBRecord::from_row(r),
488488
)?;
489489

@@ -552,7 +552,7 @@ impl Experiment {
552552
let results_len: u32 = db
553553
.get_row(
554554
"SELECT COUNT(*) AS count FROM results WHERE experiment = ?1;",
555-
&[&self.name.as_str()],
555+
[&self.name.as_str()],
556556
|r| r.get("count"),
557557
)?
558558
.unwrap();
@@ -561,7 +561,7 @@ impl Experiment {
561561
.get_row(
562562
"SELECT COUNT(*) AS count FROM experiment_crates \
563563
WHERE experiment = ?1 AND skipped = 0;",
564-
&[&self.name.as_str()],
564+
[&self.name.as_str()],
565565
|r| r.get("count"),
566566
)?
567567
.unwrap();
@@ -573,7 +573,7 @@ impl Experiment {
573573
let results: Vec<(String, u32)> = db.query(
574574
"SELECT result, COUNT(*) FROM results \
575575
WHERE experiment = ?1 GROUP BY result;",
576-
&[&self.name.as_str()],
576+
[&self.name.as_str()],
577577
|r| Ok((r.get::<_, String>(0)?, r.get(1)?)),
578578
)?;
579579

@@ -596,7 +596,7 @@ impl Experiment {
596596
pub fn get_crates(&self, db: &Database) -> Fallible<Vec<Crate>> {
597597
db.query(
598598
"SELECT crate FROM experiment_crates WHERE experiment = ?1;",
599-
&[&self.name],
599+
[&self.name],
600600
|r| r.get(0),
601601
)?
602602
.into_iter()

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn main() {
5050
"command failed"
5151
}
5252
);
53-
process::exit(if success { 0 } else { 1 });
53+
process::exit(i32::from(!success));
5454
}
5555

5656
fn main_() -> Fallible<()> {

src/results/db.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl<'a> ReadResults for DatabaseDB<'a> {
150150
"SELECT log, encoding FROM results \
151151
WHERE experiment = ?1 AND toolchain = ?2 AND crate = ?3 \
152152
LIMIT 1;",
153-
&[&ex.name, &toolchain.to_string(), &krate.id()],
153+
[&ex.name, &toolchain.to_string(), &krate.id()],
154154
|row| {
155155
let log: Vec<u8> = row.get("log")?;
156156
let encoding: String = row.get("encoding")?;
@@ -176,7 +176,7 @@ impl<'a> ReadResults for DatabaseDB<'a> {
176176
"SELECT result FROM results \
177177
WHERE experiment = ?1 AND toolchain = ?2 AND crate = ?3 \
178178
LIMIT 1;",
179-
&[&ex.name, &toolchain.to_string(), &krate.id()],
179+
[&ex.name, &toolchain.to_string(), &krate.id()],
180180
|row| row.get("result"),
181181
)?
182182
.pop();

src/server/routes/webhooks/commands.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ fn store_experiment_name(db: &Database, issue: &Issue, name: &str) -> Fallible<(
311311
fn default_experiment_name(db: &Database, issue: &Issue) -> Fallible<Option<String>> {
312312
let name = db.get_row(
313313
"SELECT experiment FROM saved_names WHERE issue = ?1",
314-
&[&issue.number],
314+
[&issue.number],
315315
|r| r.get(0),
316316
)?;
317317

src/server/try_builds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub(crate) fn detect(
5151
pub(crate) fn get_sha(db: &Database, repo: &str, pr: i32) -> Fallible<Option<TryBuild>> {
5252
db.get_row(
5353
"SELECT base_sha, merge_sha FROM try_builds WHERE repo = ?1 AND pr = ?2;",
54-
&[repo, &pr.to_string()],
54+
[repo, &pr.to_string()],
5555
|row| {
5656
Ok(TryBuild {
5757
base_sha: row.get("base_sha")?,

0 commit comments

Comments
 (0)