From 421b89460fd1f0548744ef5a7ce3c51f0adf2585 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 31 Jan 2021 17:51:32 -0800 Subject: [PATCH 1/5] cargo: added patch for #28372 --- srcpkgs/cargo/patches/fix-serde.diff | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/cargo/patches/fix-serde.diff diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff new file mode 100644 index 00000000000..b177d71a18a --- /dev/null +++ b/srcpkgs/cargo/patches/fix-serde.diff @@ -0,0 +1,13 @@ +diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs +index 758f5c23f1..a70cd0dce8 100644 +--- src/cargo/util/config/de.rs ++++ src/cargo/util/config/de.rs +@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> { + seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy())) + } + Definition::Environment(env) => { +- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref())) ++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str())) + } + Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")), + } From 8ce12b15a338ca038cd94312133918e92fe3b261 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 31 Jan 2021 18:00:38 -0800 Subject: [PATCH 2/5] cargo: added patch location --- srcpkgs/cargo/patches/fix-serde.diff | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff index b177d71a18a..d76499f5cd9 100644 --- a/srcpkgs/cargo/patches/fix-serde.diff +++ b/srcpkgs/cargo/patches/fix-serde.diff @@ -1,3 +1,4 @@ +This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff" diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs index 758f5c23f1..a70cd0dce8 100644 --- src/cargo/util/config/de.rs From b63f0ed70cd686816834c7c4816ca585592ce252 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 31 Jan 2021 17:51:32 -0800 Subject: [PATCH 3/5] cargo: added patch for #28372 --- srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/cargo/patches/fix-serde.diff diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff new file mode 100644 index 00000000000..d76499f5cd9 --- /dev/null +++ b/srcpkgs/cargo/patches/fix-serde.diff @@ -0,0 +1,14 @@ +This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff" +diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs +index 758f5c23f1..a70cd0dce8 100644 +--- src/cargo/util/config/de.rs ++++ src/cargo/util/config/de.rs +@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> { + seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy())) + } + Definition::Environment(env) => { +- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref())) ++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str())) + } + Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")), + } From c7b528bedeefed4be2a8c4639c3bd707e98696ea Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 31 Jan 2021 19:24:51 -0800 Subject: [PATCH 4/5] cargo: added patch for #28372 --- srcpkgs/cargo/patches/fix-serde.diff | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff index d76499f5cd9..e7c1bc28726 100644 --- a/srcpkgs/cargo/patches/fix-serde.diff +++ b/srcpkgs/cargo/patches/fix-serde.diff @@ -1,4 +1,6 @@ This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff" +======= +>>>>>>> 421b89460f (cargo: added patch for #28372) diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs index 758f5c23f1..a70cd0dce8 100644 --- src/cargo/util/config/de.rs From c690262778c8ae0d857e12f2c74abb9089eb4d36 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 31 Jan 2021 19:25:51 -0800 Subject: [PATCH 5/5] cargo: added patch for #28372 --- srcpkgs/cargo/patches/fix-serde.diff | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff index e7c1bc28726..d76499f5cd9 100644 --- a/srcpkgs/cargo/patches/fix-serde.diff +++ b/srcpkgs/cargo/patches/fix-serde.diff @@ -1,6 +1,4 @@ This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff" -======= ->>>>>>> 421b89460f (cargo: added patch for #28372) diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs index 758f5c23f1..a70cd0dce8 100644 --- src/cargo/util/config/de.rs