Skip to content

Commit 84095ee

Browse files
authored
Merge pull request #13915 from gitbutlerapp/dp-fix-build
Fix misc lint issues
2 parents fc594f8 + e1e909e commit 84095ee

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,10 @@ uninlined_format_args = "deny"
323323
# This comes mostly from `thiserror` in `gix`, and it's going to be converted
324324
# to `Exn`, which will box erorrs and keep them small (much like `anyhow`).
325325
result_large_err = "allow"
326+
# This being `deny` is overly strict
327+
unnecessary_mut_passed = "warn"
328+
# This being `deny` is overly strict
329+
needless_borrow = "warn"
326330

327331
[profile.release]
328332
# There are no overrides here as we optimise for fast release builds,

crates/but-server/src/irc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ pub async fn irc_start_working_files_broadcast(
256256

257257
// Seed initial file list from the current worktree state.
258258
let initial_files = match but_ctx::Context::try_from(project_id.clone()) {
259-
Ok(mut ctx) => match but_api::diff::changes_in_worktree(&mut ctx) {
259+
Ok(ctx) => match but_api::diff::changes_in_worktree(&ctx) {
260260
Ok(changes) => changes
261261
.worktree_changes
262262
.changes

crates/but/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ async fn match_subcommand(
265265
#[cfg(feature = "agentlog")]
266266
let cmd = match cmd {
267267
Subcommands::AgentLog { cmd } => {
268-
return run_agentlog_command(&args.current_dir, cmd, out);
268+
return Ok(run_agentlog_command(&args.current_dir, cmd, out)?);
269269
}
270270
cmd => cmd,
271271
};

crates/gitbutler-tauri/src/irc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ pub async fn irc_start_working_files_broadcast(
374374

375375
// Seed initial file list from the current worktree state.
376376
let initial_files = match but_ctx::Context::try_from(project_id.clone()) {
377-
Ok(mut ctx) => match but_api::diff::changes_in_worktree(&mut ctx) {
377+
Ok(ctx) => match but_api::diff::changes_in_worktree(&ctx) {
378378
Ok(changes) => changes
379379
.worktree_changes
380380
.changes

0 commit comments

Comments
 (0)