diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/upstream/u-fix-get-toml-when-test.patch (renamed from debian/patches/u-fix-get-toml-when-test.patch) | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/upstream/u-fix-get-toml-when-test.patch index 09ba0552e..cbe054b73 100644 --- a/debian/patches/u-fix-get-toml-when-test.patch +++ b/debian/patches/upstream/u-fix-get-toml-when-test.patch @@ -1,16 +1,23 @@ -Description: Fix get_toml() when cfg(test) - When cfg(test), Config::parse doesn't parse a config.toml but uses default - values, failing when the initial rustc is needed. This is a workaround before - upstream issue gets solved. +From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> +Date: Thu, 13 Jun 2024 11:16:38 +0200 +Subject: Fix get_toml() when cfg(test) + Bug: https://github.com/rust-lang/rust/issues/105766 Last-Update: 2023-03-29 + +When cfg(test), Config::parse doesn't parse a config.toml but uses default +values, failing when the initial rustc is needed. This is a workaround before +upstream issue gets solved. +Last-Update: 2023-03-29 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/src/bootstrap/src/core/config/config.rs -=================================================================== ---- rust.orig/src/bootstrap/src/core/config/config.rs -+++ rust/src/bootstrap/src/core/config/config.rs -@@ -1093,8 +1093,32 @@ impl Config { + src/bootstrap/src/core/config/config.rs | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index f1e1b89..738d2e1 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -1180,8 +1180,32 @@ impl Config { pub fn parse(args: &[String]) -> Config { #[cfg(test)] |