From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- vendor/gix-diff/Cargo.toml | 56 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 9 deletions(-) (limited to 'vendor/gix-diff/Cargo.toml') diff --git a/vendor/gix-diff/Cargo.toml b/vendor/gix-diff/Cargo.toml index 681db4e74..46dbf8d63 100644 --- a/vendor/gix-diff/Cargo.toml +++ b/vendor/gix-diff/Cargo.toml @@ -13,12 +13,11 @@ edition = "2021" rust-version = "1.65" name = "gix-diff" -version = "0.37.0" +version = "0.38.0" authors = ["Sebastian Thiel "] include = [ "src/**/*", "LICENSE-*", - "CHANGELOG.md", ] autotests = false description = "Calculate differences between various git objects" @@ -28,14 +27,14 @@ repository = "https://github.com/Byron/gitoxide" [package.metadata.docs.rs] all-features = true features = ["document-features"] -rustdoc-args = [ - "--cfg", - "docsrs", -] [lib] doctest = false +[dependencies.bstr] +version = "1.5.0" +default-features = false + [dependencies.document-features] version = "0.2.0" optional = true @@ -46,11 +45,41 @@ features = ["js"] optional = true default-features = false +[dependencies.gix-command] +version = "^0.3.0" +optional = true + +[dependencies.gix-filter] +version = "^0.7.0" +optional = true + +[dependencies.gix-fs] +version = "^0.8.1" +optional = true + [dependencies.gix-hash] -version = "^0.13.1" +version = "^0.13.2" [dependencies.gix-object] -version = "^0.38.0" +version = "^0.39.0" + +[dependencies.gix-path] +version = "^0.10.1" +optional = true + +[dependencies.gix-tempfile] +version = "11.0.0" +optional = true + +[dependencies.gix-trace] +version = "^0.1.4" +optional = true + +[dependencies.gix-worktree] +version = "^0.28.0" +features = ["attributes"] +optional = true +default-features = false [dependencies.imara-diff] version = "0.1.3" @@ -66,7 +95,16 @@ default-features = false version = "1.0.32" [features] -blob = ["dep:imara-diff"] +blob = [ + "dep:imara-diff", + "dep:gix-filter", + "dep:gix-worktree", + "dep:gix-path", + "dep:gix-fs", + "dep:gix-command", + "dep:gix-tempfile", + "dep:gix-trace", +] default = ["blob"] serde = [ "dep:serde", -- cgit v1.2.3