From 73e46ef431540f66b000cb689c7c6f76afecc44a Mon Sep 17 00:00:00 2001
From: Philippe Antoine
Date: Wed, 2 Oct 2024 14:11:51 +0200
Subject: [PATCH] rust: unpin serde
now that clang was updated ton 18.1 and nightly is more recent
---
projects/askama/build.sh | 4 ----
projects/bson-rust/build.sh | 4 ----
projects/librsvg/build.sh | 6 ------
projects/opensk/build.sh | 4 ----
projects/ron/build.sh | 4 ----
projects/servo/build.sh | 3 ---
projects/toml_edit/build.sh | 4 ----
7 files changed, 29 deletions(-)
diff --git a/projects/askama/build.sh b/projects/askama/build.sh
index 9422b110f866..cc27cbde619d 100755
--- a/projects/askama/build.sh
+++ b/projects/askama/build.sh
@@ -17,10 +17,6 @@
set -eox pipefail
-pushd $SRC/askama/fuzz
-cargo update -p serde --precise 1.0.200
-popd
-
target_out_dir=fuzz/target/x86_64-unknown-linux-gnu/release
cargo fuzz build -O
cargo fuzz list | while read i; do
diff --git a/projects/bson-rust/build.sh b/projects/bson-rust/build.sh
index 7bb77a32c3a0..220612b28735 100755
--- a/projects/bson-rust/build.sh
+++ b/projects/bson-rust/build.sh
@@ -15,10 +15,6 @@
#
################################################################################
-pushd $SRC/bson-rust/fuzz
-cargo update -p serde --precise 1.0.200
-popd
-
cargo fuzz build -O
fuzz_release=fuzz/target/x86_64-unknown-linux-gnu/release
cp $fuzz_release/deserialize $OUT/
diff --git a/projects/librsvg/build.sh b/projects/librsvg/build.sh
index a49a8fabbd40..1565acdf3400 100755
--- a/projects/librsvg/build.sh
+++ b/projects/librsvg/build.sh
@@ -81,12 +81,6 @@ export CXXFLAGS="${CXXFLAGS_SAVE}"
# Compile and copy the fuzz target(s)
cd "$SRC/librsvg/fuzz"
-# Pin serde because it now requires a nightly compiler that is more recent than the one on the
-# OSS-Fuzz image:
-# https://github.com/serde-rs/serde/issues/2770
-# https://github.com/google/oss-fuzz/pull/12077
-cargo update --package serde --precise 1.0.203
-
cargo fuzz build -O
cp target/x86_64-unknown-linux-gnu/release/render_document "$OUT/"
diff --git a/projects/opensk/build.sh b/projects/opensk/build.sh
index c3447b2509c1..66e51fdd2193 100755
--- a/projects/opensk/build.sh
+++ b/projects/opensk/build.sh
@@ -29,10 +29,6 @@ build_and_copy() {
cd OpenSK
-# Temporary fix to pin serde
-pushd libraries/opensk/fuzz
-cargo update -p serde --precise 1.0.200
-popd
# CTAP library fuzzing targets
build_and_copy libraries/opensk
diff --git a/projects/ron/build.sh b/projects/ron/build.sh
index f23405c917e8..165c998c085e 100755
--- a/projects/ron/build.sh
+++ b/projects/ron/build.sh
@@ -16,10 +16,6 @@
################################################################################
-pushd $SRC/ron/fuzz
-cargo update -p serde --precise 1.0.200
-popd
-
cargo fuzz build -O
FUZZ_TARGET_OUTPUT_DIR=fuzz/target/x86_64-unknown-linux-gnu/release
for f in fuzz/fuzz_targets/*.rs
diff --git a/projects/servo/build.sh b/projects/servo/build.sh
index 76646ce5f862..81db31b64091 100755
--- a/projects/servo/build.sh
+++ b/projects/servo/build.sh
@@ -15,9 +15,6 @@
#
################################################################################
-cd $SRC/html5ever/html5ever/fuzz
-cargo update -p serde --precise 1.0.200
-cd ..
cargo fuzz build -O
cp fuzz/target/x86_64-unknown-linux-gnu/release/fuzz_document_parse $OUT/
diff --git a/projects/toml_edit/build.sh b/projects/toml_edit/build.sh
index 1ac23549523e..9df8f9605f3c 100755
--- a/projects/toml_edit/build.sh
+++ b/projects/toml_edit/build.sh
@@ -15,10 +15,6 @@
#
################################################################################
-pushd $SRC/toml_edit/crates/toml_edit_fuzz
-cargo update -p serde --precise 1.0.203
-popd
-
cd $SRC/toml_edit
cargo fuzz build --fuzz-dir=./crates/toml_edit_fuzz -O
cp target/x86_64-unknown-linux-gnu/release/parse_document $OUT/