Skip to content

Commit 1fd91ee

Browse files
committed
Nightly clippy fixes
There are a few additionaly warnings because of rust-lang/rust-clippy#12377, which is a nightly-only bug that will hopefully be fixed.
1 parent b926fd8 commit 1fd91ee

File tree

10 files changed

+1
-15
lines changed

10 files changed

+1
-15
lines changed

cli/src/cli_util.rs

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ use jj_lib::workspace::{
7373
use jj_lib::{dag_walk, file_util, git, op_walk, revset};
7474
use once_cell::unsync::OnceCell;
7575
use thiserror::Error;
76-
use toml_edit;
7776
use tracing::instrument;
7877
use tracing_chrome::ChromeLayerBuilder;
7978
use tracing_subscriber::prelude::*;

cli/src/merge_tools/builtin.rs

-1
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,6 @@ mod tests {
558558
use jj_lib::conflicts::extract_as_single_hunk;
559559
use jj_lib::merge::MergedTreeValue;
560560
use jj_lib::repo::Repo;
561-
use pollster::FutureExt;
562561
use testutils::TestRepo;
563562

564563
use super::*;

lib/src/backend.rs

-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ use std::any::Any;
1818
use std::collections::BTreeMap;
1919
use std::fmt::Debug;
2020
use std::io::Read;
21-
use std::result::Result;
2221
use std::time::SystemTime;
23-
use std::vec::Vec;
2422

2523
use async_trait::async_trait;
2624
use thiserror::Error;

lib/src/content_hash.rs

-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ where
149149
mod tests {
150150
use std::collections::{BTreeMap, HashMap};
151151

152-
use blake2::Blake2b512;
153-
154152
use super::*;
155153

156154
#[test]

lib/src/default_index/revset_engine.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,6 @@ fn has_diff_from_parent(
10901090
#[cfg(test)]
10911091
mod tests {
10921092
use super::*;
1093-
use crate::backend::{ChangeId, CommitId};
10941093
use crate::default_index::DefaultMutableIndex;
10951094

10961095
/// Generator of unique 16-byte ChangeId excluding root id

lib/src/git_backend.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,6 @@ mod tests {
12951295
use test_case::test_case;
12961296

12971297
use super::*;
1298-
use crate::backend::{FileId, MillisSinceEpoch};
12991298
use crate::content_hash::blake2b_hash;
13001299

13011300
#[test_case(false; "legacy tree format")]

lib/src/id_prefix.rs

-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@ fn unwrap_as_short_key<const N: usize>(key_bytes: &[u8]) -> &[u8; N] {
445445
#[cfg(test)]
446446
mod tests {
447447
use super::*;
448-
use crate::backend::ChangeId;
449448

450449
#[derive(Clone, Copy, Eq, PartialEq)]
451450
struct Position(usize);

lib/src/local_backend.rs

-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ mod tests {
496496
use pollster::FutureExt;
497497

498498
use super::*;
499-
use crate::backend::MillisSinceEpoch;
500499

501500
/// Test that parents get written correctly
502501
#[test]

lib/src/simple_op_store.rs

-4
Original file line numberDiff line numberDiff line change
@@ -685,10 +685,6 @@ mod tests {
685685
use maplit::{btreemap, hashmap, hashset};
686686

687687
use super::*;
688-
use crate::backend::{CommitId, MillisSinceEpoch, Timestamp};
689-
use crate::content_hash::blake2b_hash;
690-
use crate::object_id::ObjectId;
691-
use crate::op_store::{OperationMetadata, RefTarget, WorkspaceId};
692688

693689
fn create_view() -> View {
694690
let new_remote_ref = |target: &RefTarget| RemoteRef {

lib/src/ssh_signing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ impl SigningBackend for SshBackend {
269269
#[cfg(test)]
270270
mod tests {
271271
use std::fs::File;
272-
use std::io::{Read, Write};
272+
use std::io::Read;
273273

274274
use super::*;
275275

0 commit comments

Comments
 (0)