Rework spin deletion

brave · Apr 29, 2024 · 2d7f22e · 2d7f22e
1 parent 351a231
commit 2d7f22e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 25 deletions.
diff --git a/third_party/rust/chromium_crates_io/Cargo.lock b/third_party/rust/chromium_crates_io/Cargo.lock
diff --git a/third_party/rust/chromium_crates_io/gnrt_config.toml b/third_party/rust/chromium_crates_io/gnrt_config.toml
@@ -76,7 +76,10 @@ config_template = "vet_config.toml.hbs"
 
 [resolve]
 root = "chromium"
-remove_crates = ['cc', 'link-cplusplus', 'wasi', 'winapi-i686-pc-windows-gnu', 'winapi-x86_64-pc-windows-gnu', 'minimal-lexical']
+# spin is added by pasta-curves lazy_static/spin_no_std, but we don't want to
+# use it and lazy_static is an upstream crate with a patch.crates-io so the
+# feature (and dependency) do not get added to the build anyway
+remove_crates = ['cc', 'link-cplusplus', 'wasi', 'winapi-i686-pc-windows-gnu', 'winapi-x86_64-pc-windows-gnu', 'minimal-lexical', 'spin']
 
 [crate.bitvec]
 extra_input_roots = ['../doc', '../README.md' ]

diff --git a/.../patches/pasta_curves-0.5.1/0001-Remove-spin_no_std-for-lazy_static-in-pasta_curves.patch b/.../patches/pasta_curves-0.5.1/0001-Remove-spin_no_std-for-lazy_static-in-pasta_curves.patch
diff --git a/third_party/rust/chromium_crates_io/vendor/pasta_curves-0.5.1/Cargo.toml b/third_party/rust/chromium_crates_io/vendor/pasta_curves-0.5.1/Cargo.toml
@@ -81,6 +81,7 @@ default-features = false
 
 [dependencies.lazy_static]
 version = "1.4.0"
+features = ["spin_no_std"]
 optional = true
 
 [dependencies.rand]

diff --git a/third_party/rust/chromium_crates_io/vendor/spin-0.5.2/.cargo-checksum.json b/third_party/rust/chromium_crates_io/vendor/spin-0.5.2/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{}}
diff --git a/third_party/rust/chromium_crates_io/vendor/spin-0.5.2/Cargo.toml b/third_party/rust/chromium_crates_io/vendor/spin-0.5.2/Cargo.toml
@@ -0,0 +1,16 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# @generated from third_party/rust/chromium_crates_io/removed_Cargo.toml
+# by tools/crates/gnrt. Do not edit!
+
+# This is an empty crate that has replaced the 'spin' crate, since
+# it was listed in `resolve.remove_crates` in gnrt_config.toml.
+
+[package]
+name = "spin"
+version = "0.5.2"
+
+[features]
+
diff --git a/third_party/rust/chromium_crates_io/vendor/spin-0.5.2/src/lib.rs b/third_party/rust/chromium_crates_io/vendor/spin-0.5.2/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// @generated from third_party/rust/chromium_crates_io/removed_lib.rs
+// by tools/crates/gnrt. Do not edit!
+
+// This is an empty crate that has replaced the 'spin' crate, since
+// it was listed in `resolve.remove_crates` in gnrt_config.toml.