Date: Mon, 19 Feb 2024 11:59:45 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f22f38c88199 - main - devel/dtool: Fix build with rust-1.76.0 Message-ID: <202402191159.41JBxjBN005522@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=f22f38c881992ab30935acaf801663739365a6d3 commit f22f38c881992ab30935acaf801663739365a6d3 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2024-02-10 11:16:04 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2024-02-19 11:59:02 +0000 devel/dtool: Fix build with rust-1.76.0 Import upstream patch [1] to fix the following error: error[E0310]: the parameter type `T` may not live long enough --> /wrkdirs/usr/ports/devel/dtool/work/dtool-0.12.0/cargo-crates/rustc-serialize-0.3.24/src/serialize.rs:1155:5 [1] https://github.com/rust-lang-deprecated/rustc-serialize/commit/75ce92452a5f7c25a58fdea81e5f6f888630a2c9 PR: 276920 Approved by: portmgr (build fix blanket) --- ...tch-cargo-crates_rustc-serialize-0.3.24_src_serialize.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/devel/dtool/files/patch-cargo-crates_rustc-serialize-0.3.24_src_serialize.rs b/devel/dtool/files/patch-cargo-crates_rustc-serialize-0.3.24_src_serialize.rs new file mode 100644 index 000000000000..2ec700f0bcf5 --- /dev/null +++ b/devel/dtool/files/patch-cargo-crates_rustc-serialize-0.3.24_src_serialize.rs @@ -0,0 +1,13 @@ +https://github.com/rust-lang-deprecated/rustc-serialize/commit/75ce92452a5f7c25a58fdea81e5f6f888630a2c9 + +--- cargo-crates/rustc-serialize-0.3.24/src/serialize.rs.orig 2024-02-10 11:58:37 UTC ++++ cargo-crates/rustc-serialize-0.3.24/src/serialize.rs +@@ -1152,7 +1152,7 @@ impl<'a, T: ?Sized> Decodable for Cow<'a, T> + where T: ToOwned, T::Owned: Decodable + { + #[inline] +- fn decode<D: Decoder>(d: &mut D) -> Result<Cow<'static, T>, D::Error> { ++ fn decode<D: Decoder>(d: &mut D) -> Result<Cow<'a, T>, D::Error> { + Ok(Cow::Owned(try!(Decodable::decode(d)))) + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402191159.41JBxjBN005522>