From 5cc654cd3331f6586b5cd2841d9e1cfdc1e02826 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Fri, 14 Jul 2023 14:26:08 +0900 Subject: [PATCH] Really remove ntapi patching except spl-token-cli's one (#32491) --- Cargo.lock | 5 ----- Cargo.toml | 4 ---- programs/sbf/Cargo.lock | 5 ----- programs/sbf/Cargo.toml | 4 ---- 4 files changed, 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dfb78ce89..3b6f6e127 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8986,8 +8986,3 @@ dependencies = [ "cc", "libc", ] - -[[patch.unused]] -name = "ntapi" -version = "0.3.7" -source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad" diff --git a/Cargo.toml b/Cargo.toml index 8cd11db75..58fcee909 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -411,10 +411,6 @@ zstd = "0.11.2" # for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } -# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix: -# https://github.com/MSxDOS/ntapi/pull/12 -ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" } - # We include the following crates as our dependencies above from crates.io: # # * spl-associated-token-account diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index f4b8484e7..6310d77c4 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7906,8 +7906,3 @@ dependencies = [ "cc", "libc", ] - -[[patch.unused]] -name = "ntapi" -version = "0.3.7" -source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad" diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml index 6e584924f..0d554e6e6 100644 --- a/programs/sbf/Cargo.toml +++ b/programs/sbf/Cargo.toml @@ -160,10 +160,6 @@ members = [ targets = ["x86_64-unknown-linux-gnu"] [patch.crates-io] -# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix: -# https://github.com/MSxDOS/ntapi/pull/12 -ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" } - # We include the following crates as our dependencies from crates.io: # # * spl-associated-token-account