From a2c11bae3206b1638c043d06f79334319b0a92ea Mon Sep 17 00:00:00 2001 From: Benjamin Kietzman Date: Wed, 8 Jan 2025 08:32:23 -0800 Subject: [PATCH] remove unnecessary gen.patch --- arrow-ipc/gen.patch | 60 --------------------------------------------- arrow-ipc/regen.sh | 7 ------ 2 files changed, 67 deletions(-) delete mode 100644 arrow-ipc/gen.patch diff --git a/arrow-ipc/gen.patch b/arrow-ipc/gen.patch deleted file mode 100644 index b29f05cc1c2d..000000000000 --- a/arrow-ipc/gen.patch +++ /dev/null @@ -1,60 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -diff --git a/arrow-ipc/src/gen/File.rs b/arrow-ipc/src/gen/File.rs -index 35ed13c0..427cf75d 100644 ---- a/arrow-ipc/src/gen/File.rs -+++ b/arrow-ipc/src/gen/File.rs -@@ -66,6 +66,10 @@ impl<'b> flatbuffers::Push for Block { - let src = ::core::slice::from_raw_parts(self as *const Block as *const u8, Self::size()); - dst.copy_from_slice(src); - } -+ #[inline] -+ fn alignment() -> flatbuffers::PushAlignment { -+ flatbuffers::PushAlignment::new(8) -+ } - } - - impl<'a> flatbuffers::Verifiable for Block { -diff --git a/arrow-ipc/src/gen/Message.rs b/arrow-ipc/src/gen/Message.rs -index ea0c7236..928b41cc 100644 ---- a/arrow-ipc/src/gen/Message.rs -+++ b/arrow-ipc/src/gen/Message.rs -@@ -386,6 +386,10 @@ impl<'b> flatbuffers::Push for FieldNode { - ::core::slice::from_raw_parts(self as *const FieldNode as *const u8, Self::size()); - dst.copy_from_slice(src); - } -+ #[inline] -+ fn alignment() -> flatbuffers::PushAlignment { -+ flatbuffers::PushAlignment::new(8) -+ } - } - - impl<'a> flatbuffers::Verifiable for FieldNode { -diff --git a/arrow-ipc/src/gen/Schema.rs b/arrow-ipc/src/gen/Schema.rs -index ebe3f5f1..223e5a2f 100644 ---- a/arrow-ipc/src/gen/Schema.rs -+++ b/arrow-ipc/src/gen/Schema.rs -@@ -1152,6 +1152,10 @@ impl<'b> flatbuffers::Push for Buffer { - let src = ::core::slice::from_raw_parts(self as *const Buffer as *const u8, Self::size()); - dst.copy_from_slice(src); - } -+ #[inline] -+ fn alignment() -> flatbuffers::PushAlignment { -+ flatbuffers::PushAlignment::new(8) -+ } - } - - impl<'a> flatbuffers::Verifiable for Buffer { diff --git a/arrow-ipc/regen.sh b/arrow-ipc/regen.sh index a64197b6b1ab..b368bd1bc7cc 100755 --- a/arrow-ipc/regen.sh +++ b/arrow-ipc/regen.sh @@ -148,13 +148,6 @@ done popd cargo +stable fmt -- src/gen/* -if git apply gen.patch; then - echo "Applied gen.patch" -else - echo "Error applying gen.patch" - exit 1 -fi - echo "DONE!" echo "Please run 'cargo doc' and 'cargo test' with nightly and stable, " echo "and fix possible errors or warnings!"