summaryrefslogtreecommitdiffstats
path: root/debian/patches/cargo
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch (renamed from debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch)20
-rw-r--r--debian/patches/cargo/c-2002_disable-net-tests.patch (renamed from debian/patches/c-2002_disable-net-tests.patch)217
-rw-r--r--debian/patches/cargo/c-2003-workaround-qemu-vfork-command-not-found.patch (renamed from debian/patches/c-2003-workaround-qemu-vfork-command-not-found.patch)17
-rw-r--r--debian/patches/cargo/c-2200-workaround-x32-test.patch22
-rw-r--r--debian/patches/cargo/c-disable-fs-specific-test.patch22
-rw-r--r--debian/patches/cargo/d-0012-cargo-always-return-dev-channel.patch (renamed from debian/patches/d-0012-cargo-always-return-dev-channel.patch)5
6 files changed, 180 insertions, 123 deletions
diff --git a/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch b/debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch
index e3a6397d5..fef435fc6 100644
--- a/debian/patches/c-0003-tests-add-missing-cross-disabled-checks.patch
+++ b/debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch
@@ -1,10 +1,8 @@
-From 981279ccd8f7855faaed010bff0891afff588210 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?=
- <debian@fabian.gruenbichler.email>
+From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <debian@fabian.gruenbichler.email>
Date: Sat, 19 Nov 2022 10:24:08 +0100
Subject: [PATCH] tests: add missing cross disabled checks
MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
cross_conmpile::alternate states it should only be used in test cases
@@ -12,16 +10,17 @@ after checking cross_compile::disabled(), which is missing here. these
tests fail despite setting CFG_DISABLE_CROSS_TESTS on i386, since both
the host and the alternate cross target would be i686 in that case.
+
Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
---
- tests/testsuite/build_script.rs | 6 ++++++
+ src/tools/cargo/tests/testsuite/build_script.rs | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
-index 902364dff..e458b3262 100644
+diff --git a/src/tools/cargo/tests/testsuite/build_script.rs b/src/tools/cargo/tests/testsuite/build_script.rs
+index f7361fc..f587ddd 100644
--- a/src/tools/cargo/tests/testsuite/build_script.rs
+++ b/src/tools/cargo/tests/testsuite/build_script.rs
-@@ -697,6 +697,9 @@ fn custom_build_linker_bad_host_with_arc
+@@ -734,6 +734,9 @@ fn custom_build_linker_bad_host_with_arch() {
#[cargo_test]
fn custom_build_env_var_rustc_linker_cross_arch_host() {
let target = rustc_host();
@@ -31,7 +30,7 @@ index 902364dff..e458b3262 100644
let cross_target = cross_compile::alternate();
let p = project()
.file(
-@@ -735,6 +738,9 @@ fn custom_build_env_var_rustc_linker_cro
+@@ -772,6 +775,9 @@ fn custom_build_env_var_rustc_linker_cross_arch_host() {
#[cargo_test]
fn custom_build_linker_bad_cross_arch_host() {
let target = rustc_host();
@@ -41,6 +40,3 @@ index 902364dff..e458b3262 100644
let cross_target = cross_compile::alternate();
let p = project()
.file(
---
-2.38.1
-
diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/cargo/c-2002_disable-net-tests.patch
index 76f158538..5ed606980 100644
--- a/debian/patches/c-2002_disable-net-tests.patch
+++ b/debian/patches/cargo/c-2002_disable-net-tests.patch
@@ -1,22 +1,96 @@
-Description: Disable network tests
-Author: Ximin Luo <infinity0@debian.org>
+From: Ximin Luo <infinity0@debian.org>
+Date: Thu, 13 Jun 2024 11:16:38 +0200
+Subject: Disable network tests
+
Forwarded: TODO
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/src/tools/cargo/tests/testsuite/git_auth.rs
-===================================================================
---- rust.orig/src/tools/cargo/tests/testsuite/git_auth.rs
-+++ rust/src/tools/cargo/tests/testsuite/git_auth.rs
-@@ -103,7 +103,7 @@ fn setup_failed_auth_test() -> (SocketAd
+ .../cargo/tests/testsuite/credential_process.rs | 14 +--
+ src/tools/cargo/tests/testsuite/git_auth.rs | 4 +-
+ src/tools/cargo/tests/testsuite/net_config.rs | 4 +-
+ src/tools/cargo/tests/testsuite/publish.rs | 104 ++++++++++-----------
+ 4 files changed, 63 insertions(+), 63 deletions(-)
+
+diff --git a/src/tools/cargo/tests/testsuite/credential_process.rs b/src/tools/cargo/tests/testsuite/credential_process.rs
+index 815089f..477e5d2 100644
+--- a/src/tools/cargo/tests/testsuite/credential_process.rs
++++ b/src/tools/cargo/tests/testsuite/credential_process.rs
+@@ -63,7 +63,7 @@ fn get_token_test() -> (Project, TestRegistry) {
+ (p, server)
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn publish() {
+ // Checks that credential-process is used for `cargo publish`.
+ let (p, _t) = get_token_test();
+@@ -85,7 +85,7 @@ You may press ctrl-c [..]
+ .run();
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn basic_unsupported() {
+ // Non-action commands don't support login/logout.
+ let registry = registry::RegistryBuilder::new()
+@@ -121,7 +121,7 @@ Caused by:
+ .run();
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn login() {
+ let registry = registry::RegistryBuilder::new()
+ .no_configure_token()
+@@ -142,7 +142,7 @@ fn login() {
+ .run();
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn logout() {
+ let server = registry::RegistryBuilder::new()
+ .no_configure_token()
+@@ -161,7 +161,7 @@ fn logout() {
+ .run();
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn yank() {
+ let (p, _t) = get_token_test();
+
+@@ -176,7 +176,7 @@ fn yank() {
+ .run();
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn owner() {
+ let (p, _t) = get_token_test();
+
+@@ -191,7 +191,7 @@ fn owner() {
+ .run();
+ }
+
+-#[cargo_test]
++#[allow(dead_code)]
+ fn invalid_token_output() {
+ // Error when credential process does not output the expected format for a token.
+ let cred_proj = project()
+diff --git a/src/tools/cargo/tests/testsuite/git_auth.rs b/src/tools/cargo/tests/testsuite/git_auth.rs
+index c79ae7c..b15582e 100644
+--- a/src/tools/cargo/tests/testsuite/git_auth.rs
++++ b/src/tools/cargo/tests/testsuite/git_auth.rs
+@@ -103,7 +103,7 @@ fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc<AtomicUsize>) {
}
// Tests that HTTP auth is offered from `credential.helper`.
-#[cargo_test]
+#[allow(dead_code)]
fn http_auth_offered() {
- // TODO(Seb): remove this once possible.
- if cargo_uses_gitoxide() {
-@@ -172,7 +172,7 @@ Caused by:
+ let (addr, t, connections) = setup_failed_auth_test();
+ let p = project()
+@@ -167,7 +167,7 @@ Caused by:
}
// Boy, sure would be nice to have a TLS implementation in rust!
@@ -25,10 +99,10 @@ Index: rust/src/tools/cargo/tests/testsuite/git_auth.rs
fn https_something_happens() {
let server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap();
-Index: rust/src/tools/cargo/tests/testsuite/net_config.rs
-===================================================================
---- rust.orig/src/tools/cargo/tests/testsuite/net_config.rs
-+++ rust/src/tools/cargo/tests/testsuite/net_config.rs
+diff --git a/src/tools/cargo/tests/testsuite/net_config.rs b/src/tools/cargo/tests/testsuite/net_config.rs
+index 569ec55..27c4132 100644
+--- a/src/tools/cargo/tests/testsuite/net_config.rs
++++ b/src/tools/cargo/tests/testsuite/net_config.rs
@@ -2,7 +2,7 @@
use cargo_test_support::project;
@@ -47,10 +121,10 @@ Index: rust/src/tools/cargo/tests/testsuite/net_config.rs
fn net_retry_git_outputs_warning() {
let p = project()
.file(
-Index: rust/src/tools/cargo/tests/testsuite/publish.rs
-===================================================================
---- rust.orig/src/tools/cargo/tests/testsuite/publish.rs
-+++ rust/src/tools/cargo/tests/testsuite/publish.rs
+diff --git a/src/tools/cargo/tests/testsuite/publish.rs b/src/tools/cargo/tests/testsuite/publish.rs
+index 5d29ac8..05d0f02 100644
+--- a/src/tools/cargo/tests/testsuite/publish.rs
++++ b/src/tools/cargo/tests/testsuite/publish.rs
@@ -88,7 +88,7 @@ fn validate_upload_li() {
);
}
@@ -60,7 +134,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; th
+@@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
// Check that the `token` key works at the root instead of under a
// `[registry]` table.
@@ -69,7 +143,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_publish_with_http() {
let _reg = registry::RegistryBuilder::new()
.http_api()
-@@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; th
+@@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
.run();
}
@@ -78,7 +152,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_publish_with_asymmetric() {
let _reg = registry::RegistryBuilder::new()
.http_api()
-@@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; th
+@@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
.run();
}
@@ -105,7 +179,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn git_deps() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -353,7 +353,7 @@ the `git` specification will be removed
+@@ -353,7 +353,7 @@ the `git` specification will be removed from the dependency declaration.
.run();
}
@@ -114,7 +188,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn path_dependency_no_version() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -393,7 +393,7 @@ the `path` specification will be removed
+@@ -393,7 +393,7 @@ the `path` specification will be removed from the dependency declaration.
.run();
}
@@ -132,7 +206,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn dont_publish_dirty() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -468,7 +468,7 @@ to proceed despite this and include the
+@@ -468,7 +468,7 @@ to proceed despite this and include the uncommitted changes, pass the `--allow-d
.run();
}
@@ -141,7 +215,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_clean() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; th
+@@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
// Other tests will verify the endpoint gets the right payload.
}
@@ -195,7 +269,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn registry_not_in_publish_list() {
let p = project()
.file(
-@@ -771,7 +771,7 @@ The registry `alternative` is not listed
+@@ -771,7 +771,7 @@ The registry `alternative` is not listed in the `package.publish` value in Cargo
.run();
}
@@ -222,7 +296,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_implicitly_to_only_allowed_registry() {
let _registry = RegistryBuilder::new()
.http_api()
-@@ -963,7 +963,7 @@ fn publish_failed_with_index_and_only_al
+@@ -963,7 +963,7 @@ fn publish_failed_with_index_and_only_allowed_registry() {
.run();
}
@@ -231,7 +305,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_fail_with_no_registry_specified() {
let p = project().build();
-@@ -997,7 +997,7 @@ The registry `crates-io` is not listed i
+@@ -997,7 +997,7 @@ The registry `crates-io` is not listed in the `package.publish` value in Cargo.t
.run();
}
@@ -294,7 +368,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_checks_for_token_before_verify() {
let registry = registry::RegistryBuilder::new()
.no_configure_token()
-@@ -1373,7 +1373,7 @@ fn publish_checks_for_token_before_verif
+@@ -1373,7 +1373,7 @@ fn publish_checks_for_token_before_verify() {
.run();
}
@@ -303,7 +377,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_bad_source() {
let p = project()
.file(
-@@ -1422,7 +1422,7 @@ include `--registry crates-io` to use cr
+@@ -1422,7 +1422,7 @@ include `--registry crates-io` to use crates.io
}
// A dependency with both `git` and `version`.
@@ -348,7 +422,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn cratesio_source_replacement() {
registry::init();
let p = project()
-@@ -1776,7 +1776,7 @@ include `--registry dummy-registry` or `
+@@ -1776,7 +1776,7 @@ include `--registry dummy-registry` or `--registry crates-io`
.run();
}
@@ -456,7 +530,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_not_found() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2369,7 +2369,7 @@ error: package ID specification `li` did
+@@ -2369,7 +2369,7 @@ error: package ID specification `li` did not match any packages
.run();
}
@@ -465,7 +539,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_found_multiple() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2426,7 +2426,7 @@ error: the `-p` argument must be specifi
+@@ -2426,7 +2426,7 @@ error: the `-p` argument must be specified to select a single package to publish
.run();
}
@@ -474,7 +548,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
// https://github.com/rust-lang/cargo/issues/10536
fn publish_path_dependency_without_workspace() {
// Use local registry for faster test times since no publish will occur
-@@ -2473,7 +2473,7 @@ error: package ID specification `bar` di
+@@ -2473,7 +2473,7 @@ error: package ID specification `bar` did not match any packages
.run();
}
@@ -492,7 +566,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_first_publish() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2616,7 +2616,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2616,7 +2616,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
/// A separate test is needed for package names with - or _ as they hit
/// the responder twice per cargo invocation. If that ever gets changed
/// this test will need to be changed accordingly.
@@ -501,7 +575,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_first_publish_underscore() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2712,7 +2712,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2712,7 +2712,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("build").with_status(0).run();
}
@@ -510,7 +584,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_subsequent_publish() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2804,7 +2804,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2804,7 +2804,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("check").with_status(0).run();
}
@@ -519,70 +593,3 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn skip_wait_for_publish() {
// Intentionally using local registry so the crate never makes it to the index
let registry = registry::init();
-Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
-===================================================================
---- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs
-+++ rust/src/tools/cargo/tests/testsuite/credential_process.rs
-@@ -63,7 +63,7 @@ fn get_token_test() -> (Project, TestReg
- (p, server)
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn publish() {
- // Checks that credential-process is used for `cargo publish`.
- let (p, _t) = get_token_test();
-@@ -85,7 +85,7 @@ You may press ctrl-c [..]
- .run();
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn basic_unsupported() {
- // Non-action commands don't support login/logout.
- let registry = registry::RegistryBuilder::new()
-@@ -121,7 +121,7 @@ Caused by:
- .run();
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn login() {
- let registry = registry::RegistryBuilder::new()
- .no_configure_token()
-@@ -142,7 +142,7 @@ fn login() {
- .run();
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn logout() {
- let server = registry::RegistryBuilder::new()
- .no_configure_token()
-@@ -161,7 +161,7 @@ fn logout() {
- .run();
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn yank() {
- let (p, _t) = get_token_test();
-
-@@ -176,7 +176,7 @@ fn yank() {
- .run();
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn owner() {
- let (p, _t) = get_token_test();
-
-@@ -191,7 +191,7 @@ fn owner() {
- .run();
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn invalid_token_output() {
- // Error when credential process does not output the expected format for a token.
- let cred_proj = project()
diff --git a/debian/patches/c-2003-workaround-qemu-vfork-command-not-found.patch b/debian/patches/cargo/c-2003-workaround-qemu-vfork-command-not-found.patch
index 6453c3a30..3daad1651 100644
--- a/debian/patches/c-2003-workaround-qemu-vfork-command-not-found.patch
+++ b/debian/patches/cargo/c-2003-workaround-qemu-vfork-command-not-found.patch
@@ -1,8 +1,17 @@
-Index: rust/src/tools/cargo/crates/cargo-test-macro/src/lib.rs
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Thu, 13 Jun 2024 11:16:38 +0200
+Subject: c-2003-workaround-qemu-vfork-command-not-found
+
===================================================================
---- rust.orig/src/tools/cargo/crates/cargo-test-macro/src/lib.rs
-+++ rust/src/tools/cargo/crates/cargo-test-macro/src/lib.rs
-@@ -223,6 +223,14 @@ fn has_command(command: &str) -> bool {
+---
+ src/tools/cargo/crates/cargo-test-macro/src/lib.rs | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/tools/cargo/crates/cargo-test-macro/src/lib.rs b/src/tools/cargo/crates/cargo-test-macro/src/lib.rs
+index 14672ab..9208cb3 100644
+--- a/src/tools/cargo/crates/cargo-test-macro/src/lib.rs
++++ b/src/tools/cargo/crates/cargo-test-macro/src/lib.rs
+@@ -222,6 +222,14 @@ fn has_command(command: &str) -> bool {
}
};
if !output.status.success() {
diff --git a/debian/patches/cargo/c-2200-workaround-x32-test.patch b/debian/patches/cargo/c-2200-workaround-x32-test.patch
new file mode 100644
index 000000000..eb78ec51c
--- /dev/null
+++ b/debian/patches/cargo/c-2200-workaround-x32-test.patch
@@ -0,0 +1,22 @@
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Thu, 13 Jun 2024 11:16:38 +0200
+Subject: c-2200-workaround-x32-test
+
+Bug: https://github.com/rust-lang/cargo/issues/10005
+---
+ src/tools/cargo/tests/testsuite/cfg.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/cargo/tests/testsuite/cfg.rs b/src/tools/cargo/tests/testsuite/cfg.rs
+index dcce654..c9e2e0c 100644
+--- a/src/tools/cargo/tests/testsuite/cfg.rs
++++ b/src/tools/cargo/tests/testsuite/cfg.rs
+@@ -272,7 +272,7 @@ fn any_ok() {
+
+ // https://github.com/rust-lang/cargo/issues/5313
+ #[cargo_test]
+-#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
++#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu", target_pointer_width = "64"))]
+ fn cfg_looks_at_rustflags_for_target() {
+ let p = project()
+ .file(
diff --git a/debian/patches/cargo/c-disable-fs-specific-test.patch b/debian/patches/cargo/c-disable-fs-specific-test.patch
new file mode 100644
index 000000000..84d887702
--- /dev/null
+++ b/debian/patches/cargo/c-disable-fs-specific-test.patch
@@ -0,0 +1,22 @@
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Thu, 13 Jun 2024 11:16:38 +0200
+Subject: c-disable-fs-specific-test
+
+===================================================================
+---
+ src/tools/cargo/tests/testsuite/metadata.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/cargo/tests/testsuite/metadata.rs b/src/tools/cargo/tests/testsuite/metadata.rs
+index 888cdce..f06f73f 100644
+--- a/src/tools/cargo/tests/testsuite/metadata.rs
++++ b/src/tools/cargo/tests/testsuite/metadata.rs
+@@ -3997,7 +3997,7 @@ fn dep_kinds_workspace() {
+ // Creating non-utf8 path is an OS-specific pain, so let's run this only on
+ // linux, where arbitrary bytes work.
+ #[cfg(target_os = "linux")]
+-#[cargo_test]
++#[allow(dead_code)]
+ fn cargo_metadata_non_utf8() {
+ use std::ffi::OsString;
+ use std::os::unix::ffi::OsStringExt;
diff --git a/debian/patches/d-0012-cargo-always-return-dev-channel.patch b/debian/patches/cargo/d-0012-cargo-always-return-dev-channel.patch
index 2465a48cb..7cbe41213 100644
--- a/debian/patches/d-0012-cargo-always-return-dev-channel.patch
+++ b/debian/patches/cargo/d-0012-cargo-always-return-dev-channel.patch
@@ -3,15 +3,16 @@ Date: Mon, 6 May 2024 10:25:32 +0200
Subject: d-0012-cargo-always-return-dev-channel
Last-Update: 2023-05-30
+Forwarded: not-needed
---
src/tools/cargo/src/cargo/core/features.rs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs
-index 72a267f..032a1ef 100644
+index 4f5b069..0a42077 100644
--- a/src/tools/cargo/src/cargo/core/features.rs
+++ b/src/tools/cargo/src/cargo/core/features.rs
-@@ -1192,9 +1192,8 @@ pub fn channel() -> String {
+@@ -1205,9 +1205,8 @@ pub fn channel() -> String {
return "dev".to_string();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 23:13:17 +0000