Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clippy: remove some unused code beta clippy/rustc compain about #3331

Merged
merged 1 commit into from
Mar 20, 2024
Merged

clippy: remove some unused code beta clippy/rustc compain about #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cli/src/template_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,6 @@ mod tests {
use super::*;
use crate::formatter::{self, ColorFormatter};
use crate::generic_templater::GenericTemplateLanguage;
use crate::template_parser::TemplateAliasesMap;

type TestTemplateLanguage = GenericTemplateLanguage<'static, ()>;
type TestTemplatePropertyKind = <TestTemplateLanguage as TemplateLanguage<'static>>::Property;
Expand Down
9 changes: 0 additions & 9 deletions lib/src/files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

use std::collections::VecDeque;
use std::fmt::{Debug, Error, Formatter};
use std::ops::Range;

use itertools::Itertools;

Expand Down Expand Up @@ -159,14 +158,6 @@ pub enum MergeResult {
Conflict(Vec<Merge<ContentHunk>>),
}

/// A region where the base and two sides match.
#[derive(Debug, PartialEq, Eq, Clone)]
struct SyncRegion {
base: Range<usize>,
left: Range<usize>,
right: Range<usize>,
}

pub fn merge(slices: &Merge<&[u8]>) -> MergeResult {
// TODO: Using the first remove as base (first in the inputs) is how it's
// usually done for 3-way conflicts. Are there better heuristics when there are
Expand Down