Skip to content

Commit 4fbe6ae

Browse files
committed
clippy: remove some unused code beta clippy/rustc compain about
There are still some warnings from (seemingly) clippy bugs. Quoting myself from Discord: > PSA: the latest beta cargo clippy (from Rust 1.78) has some problems > that affect jj: rust-lang/rust-clippy#12467 > and rust-lang/rust-clippy#12377. You could > disable clippy::assigning_clones and clippy::empty_docs as a workaround. > VS Code can disable them in rust-analyzer, you can also use > https://github.com/ericseppanen/cargo-cranky (you can put Cranky.toml in > the per-user gitignore).
1 parent 1ec6a8f commit 4fbe6ae

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

cli/src/template_builder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,6 @@ mod tests {
11761176
use super::*;
11771177
use crate::formatter::{self, ColorFormatter};
11781178
use crate::generic_templater::GenericTemplateLanguage;
1179-
use crate::template_parser::TemplateAliasesMap;
11801179

11811180
type TestTemplateLanguage = GenericTemplateLanguage<'static, ()>;
11821181
type TestTemplatePropertyKind = <TestTemplateLanguage as TemplateLanguage<'static>>::Property;

lib/src/files.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
use std::collections::VecDeque;
1818
use std::fmt::{Debug, Error, Formatter};
19-
use std::ops::Range;
2019

2120
use itertools::Itertools;
2221

@@ -159,14 +158,6 @@ pub enum MergeResult {
159158
Conflict(Vec<Merge<ContentHunk>>),
160159
}
161160

162-
/// A region where the base and two sides match.
163-
#[derive(Debug, PartialEq, Eq, Clone)]
164-
struct SyncRegion {
165-
base: Range<usize>,
166-
left: Range<usize>,
167-
right: Range<usize>,
168-
}
169-
170161
pub fn merge(slices: &Merge<&[u8]>) -> MergeResult {
171162
// TODO: Using the first remove as base (first in the inputs) is how it's
172163
// usually done for 3-way conflicts. Are there better heuristics when there are

0 commit comments

Comments
 (0)