diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:47 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-07 05:48:47 +0000 |
commit | 8274ece7b836b5e6312e1aa97bebdf8c1f1cb464 (patch) | |
tree | 20423151acc1cca6978e0d0cefe44638f26ad4b9 /debian/patches/u-fix-get-toml-when-test.patch | |
parent | Merging upstream version 1.75.0+dfsg1. (diff) | |
download | rustc-8274ece7b836b5e6312e1aa97bebdf8c1f1cb464.tar.xz rustc-8274ece7b836b5e6312e1aa97bebdf8c1f1cb464.zip |
Adding debian version 1.75.0+dfsg1-3.debian/1.75.0+dfsg1-3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/u-fix-get-toml-when-test.patch')
-rw-r--r-- | debian/patches/u-fix-get-toml-when-test.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch index 1aff8de0f..09ba0552e 100644 --- a/debian/patches/u-fix-get-toml-when-test.patch +++ b/debian/patches/u-fix-get-toml-when-test.patch @@ -6,17 +6,16 @@ Bug: https://github.com/rust-lang/rust/issues/105766 Last-Update: 2023-03-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: rust/src/bootstrap/config.rs +Index: rust/src/bootstrap/src/core/config/config.rs =================================================================== ---- rust.orig/src/bootstrap/config.rs -+++ rust/src/bootstrap/config.rs -@@ -1040,9 +1040,32 @@ impl Config { +--- rust.orig/src/bootstrap/src/core/config/config.rs ++++ rust/src/bootstrap/src/core/config/config.rs +@@ -1093,8 +1093,32 @@ impl Config { pub fn parse(args: &[String]) -> Config { #[cfg(test)] - fn get_toml(_: &Path) -> TomlConfig { - TomlConfig::default() -- } + fn get_toml(file: &Path) -> TomlConfig { + // Debian: We use previous version as a custom rustc, which + // unfortunately won't be picked up because config.toml isn't @@ -42,7 +41,7 @@ Index: rust/src/bootstrap/config.rs + .unwrap_or_else(|err| { + eprintln!("failed to parse TOML configuration '{}': {err}", file.display()); + crate::detail_exit(2); -+ }) } ++ }) + } #[cfg(not(test))] - fn get_toml(file: &Path) -> TomlConfig { |