diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:41:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:41:42 +0000 |
| commit | 56f5bfd26c333c7f9439bb439861e59e255d3d37 (patch) | |
| tree | 1873cff2936f7b3b4abf2ea3c46f78404009af50 /debian/patches/u-fix-get-toml-when-test.patch | |
| parent | Merging upstream version 1.70.0+dfsg2. (diff) | |
| download | rustc-56f5bfd26c333c7f9439bb439861e59e255d3d37.tar.xz rustc-56f5bfd26c333c7f9439bb439861e59e255d3d37.zip | |
Merging debian version 1.70.0+dfsg2-1.
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 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch index 2b170977c..34789ecae 100644 --- a/debian/patches/u-fix-get-toml-when-test.patch +++ b/debian/patches/u-fix-get-toml-when-test.patch @@ -6,9 +6,11 @@ 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/ ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -823,9 +823,9 @@ +Index: rust/src/bootstrap/config.rs +=================================================================== +--- rust.orig/src/bootstrap/config.rs ++++ rust/src/bootstrap/config.rs +@@ -848,9 +848,9 @@ impl Config { } pub fn parse(args: &[String]) -> Config { @@ -20,7 +22,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ let get_toml = |file: &Path| { let contents = t!(fs::read_to_string(file), format!("config file {} not found", file.display())); -@@ -834,7 +834,23 @@ +@@ -859,7 +859,23 @@ impl Config { match toml::from_str(&contents) .and_then(|table: toml::Value| TomlConfig::deserialize(table)) { |