From 132632b2a1dbd6049168c5d47287ad7aaa3f97f0 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Mon, 7 Apr 2025 14:45:55 +0200 Subject: [PATCH] Cargo: update `rustc_apfloat` patched revision --- Cargo.lock | 8 +------- Cargo.toml | 2 +- .../3rdparty/tree_sitter_extractors_deps/defs.bzl | 10 +++++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3852eeba6bb..f425373ceea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2071,8 +2071,7 @@ checksum = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1" [[package]] name = "rustc_apfloat" version = "0.2.2+llvm-462a31f5a5ab" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121e2195ff969977a4e2b5c9965ea867fce7e4cb5aee5b09dee698a7932d574f" +source = "git+https://github.com/redsun82/rustc_apfloat.git?rev=32968f16ef1b082243f9bf43a3fbd65c381b3e27#32968f16ef1b082243f9bf43a3fbd65c381b3e27" dependencies = [ "bitflags 2.9.0", "smallvec", @@ -3028,8 +3027,3 @@ dependencies = [ "quote", "syn", ] - -[[patch.unused]] -name = "rustc_apfloat" -version = "0.2.1+llvm-462a31f5a5ab" -source = "git+https://github.com/redsun82/rustc_apfloat.git?rev=096d585100636bc2e9f09d7eefec38c5b334d47b#096d585100636bc2e9f09d7eefec38c5b334d47b" diff --git a/Cargo.toml b/Cargo.toml index b20cf6dd0ed..d7406677248 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ members = [ [patch.crates-io] # patch for build script bug preventing bazel build # see https://github.com/rust-lang/rustc_apfloat/pull/17 -rustc_apfloat = { git = "https://github.com/redsun82/rustc_apfloat.git", rev = "096d585100636bc2e9f09d7eefec38c5b334d47b" } +rustc_apfloat = { git = "https://github.com/redsun82/rustc_apfloat.git", rev = "32968f16ef1b082243f9bf43a3fbd65c381b3e27" } diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl index b2db5d16f58..ee2044468e7 100644 --- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl +++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl @@ -16,6 +16,7 @@ """ load("@bazel_skylib//lib:selects.bzl", "selects") +load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") @@ -2578,12 +2579,11 @@ def crate_repositories(): ) maybe( - http_archive, + new_git_repository, name = "vendor_ts__rustc_apfloat-0.2.2-llvm-462a31f5a5ab", - sha256 = "121e2195ff969977a4e2b5c9965ea867fce7e4cb5aee5b09dee698a7932d574f", - type = "tar.gz", - urls = ["https://static.crates.io/crates/rustc_apfloat/0.2.2+llvm-462a31f5a5ab/download"], - strip_prefix = "rustc_apfloat-0.2.2+llvm-462a31f5a5ab", + commit = "32968f16ef1b082243f9bf43a3fbd65c381b3e27", + init_submodules = True, + remote = "https://github.com/redsun82/rustc_apfloat.git", build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc_apfloat-0.2.2+llvm-462a31f5a5ab.bazel"), )