Skip to content

Commit 2e99ae7

Browse files
committed
diff: clean up public API
1 parent 7c3e3cb commit 2e99ae7

File tree

2 files changed

+5
-44
lines changed

2 files changed

+5
-44
lines changed

src/diff.rs

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ pub fn write_package_diff(
249249

250250
// Generate and write the diff
251251
tracing::debug!("generating and writing package diff");
252-
let count = write_packages_diffln(
252+
let count = write_packages_diff(
253253
writer,
254254
paths_old,
255255
paths_new,
@@ -262,27 +262,8 @@ pub fn write_package_diff(
262262
count
263263
}
264264

265-
/// Writes a package diff between two paths to the provided writer.
266-
///
267-
/// This function is deprecated. Use [`write_package_diff`] instead.
268-
/// # Errors
269-
///
270-
/// Returns an error if:
271-
/// - Failed to connect to the store
272-
/// - Failed to query dependencies or system derivations
273-
/// - Failed to write to the output
274-
#[deprecated(since = "1.4.0", note = "Use `write_package_diff` instead")]
275-
pub fn write_paths_diffln(
276-
writer: &mut impl fmt::Write,
277-
path_old: &Path,
278-
path_new: &Path,
279-
) -> Result<usize> {
280-
// Setting `force_correctness` to false mimics the old behaviour.
281-
write_package_diff(writer, path_old, path_new, false)
282-
}
283-
284265
/// Computes the Levenshtein distance between two slices.
285-
pub fn levenshtein<T: Eq>(from: &[T], to: &[T]) -> usize {
266+
fn levenshtein<T: Eq>(from: &[T], to: &[T]) -> usize {
286267
let (from_len, to_len) = (from.len(), to.len());
287268

288269
if from_len == 0 {
@@ -426,7 +407,7 @@ fn count_versions(versions: Vec<Version>) -> HashMap<Version, usize> {
426407
/// # Errors
427408
///
428409
/// Returns an error if it fails writing to the `writer`
429-
pub fn write_packages_diffln(
410+
pub fn write_packages_diff(
430411
writer: &mut impl fmt::Write,
431412
paths_old: impl Iterator<Item = StorePath>,
432413
paths_new: impl Iterator<Item = StorePath>,
@@ -856,7 +837,7 @@ fn fmt_version_piece_pair(
856837
}
857838

858839
/// Spawns a background task to compute the closure sizes required by
859-
/// [`write_size_diffln`].
840+
/// [`write_size_diff`].
860841
///
861842
/// This function offloads the potentially expensive operation of calculating
862843
/// closure sizes to a separate thread, allowing the main thread to continue
@@ -924,22 +905,6 @@ pub fn write_size_diff(
924905
)
925906
}
926907

927-
/// Writes a size diff between two sizes to the provided writer.
928-
///
929-
/// This function is deprecated. Use [`write_size_diff`] instead.
930-
///
931-
/// # Errors
932-
///
933-
/// Returns `Err` when writing to `writer` fails.
934-
#[deprecated(since = "1.4.0", note = "Use `write_size_diff` instead")]
935-
pub fn write_size_diffln(
936-
writer: &mut impl fmt::Write,
937-
size_old: Size,
938-
size_new: Size,
939-
) -> fmt::Result {
940-
write_size_diff(writer, size_old, size_new)
941-
}
942-
943908
/// Generates diff objects from a mapping of package names to old and new
944909
/// versions.
945910
#[must_use]

src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ use eyre::{
1717
};
1818

1919
pub mod diff;
20-
#[expect(deprecated)]
2120
pub use diff::{
2221
generate_diffs_from_paths,
23-
levenshtein,
2422
match_version_lists,
2523
spawn_size_diff,
2624
write_package_diff,
27-
// Keep old functions for backward compatibility
28-
write_paths_diffln,
25+
write_packages_diff,
2926
write_size_diff,
30-
write_size_diffln,
3127
};
3228

3329
mod store;

0 commit comments

Comments
 (0)