a

Signed-off-by: Calvin Neo <[email protected]>
pingcap · Aug 8, 2024 · 3054566 · 3054566
1 parent bb6ebf6
commit 3054566
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -43,20 +43,20 @@ ENABLE_FEATURES ?=
 #
 # Note that enabling frame-pointer means that the Rust standard library will
 # be recompiled.
-ifndef PROXY_FRAME_POINTER
+# ifndef PROXY_FRAME_POINTER
 ARCH=$(shell uname -m)
 export PROXY_FRAME_POINTER=1
-# Disable when x86, See https://github.com/pingcap/tiflash/issues/6091
-ifeq ($(ARCH),i386)
-export PROXY_FRAME_POINTER=0
-endif
-ifeq ($(ARCH),i686)
-export PROXY_FRAME_POINTER=0
-endif
-ifeq ($(ARCH),x86_64)
-export PROXY_FRAME_POINTER=0
-endif
-endif
+# # Disable when x86, See https://github.com/pingcap/tiflash/issues/6091
+# ifeq ($(ARCH),i386)
+# export PROXY_FRAME_POINTER=0
+# endif
+# ifeq ($(ARCH),i686)
+# export PROXY_FRAME_POINTER=0
+# endif
+# ifeq ($(ARCH),x86_64)
+# export PROXY_FRAME_POINTER=0
+# endif
+# endif
 
 ifeq ($(PROXY_FRAME_POINTER),1)
 export RUSTFLAGS := $(RUSTFLAGS) -Cforce-frame-pointers=yes

diff --git a/proxy_components/engine_store_ffi/Cargo.toml b/proxy_components/engine_store_ffi/Cargo.toml
@@ -3,7 +3,7 @@ name = "engine_store_ffi"
 version = "0.0.1"
 authors = ["The TiKV Authors"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]

diff --git a/proxy_components/engine_tiflash/Cargo.toml b/proxy_components/engine_tiflash/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "engine_tiflash"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]

diff --git a/proxy_components/mock-engine-store/Cargo.toml b/proxy_components/mock-engine-store/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mock-engine-store"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/proxy_components/proxy_ffi/src/jemalloc_utils.rs b/proxy_components/proxy_ffi/src/jemalloc_utils.rs
@@ -20,8 +20,6 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 
-extern crate libc;
-
 #[allow(unused_variables)]
 #[allow(unused_mut)]
 #[allow(unused_unsafe)]

diff --git a/proxy_components/proxy_ffi/src/lib.rs b/proxy_components/proxy_ffi/src/lib.rs
@@ -1,5 +1,4 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
-#![feature(rustc_private)]
 #![feature(thread_id_value)]
 
 /// All mods end up with `_impls` impl structs defined in interface.

diff --git a/proxy_components/proxy_server/Cargo.toml b/proxy_components/proxy_server/Cargo.toml
@@ -2,7 +2,7 @@
 name = "proxy_server"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]

diff --git a/proxy_tests/Cargo.toml b/proxy_tests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "proxy_tests"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[test]]

diff --git a/raftstore-proxy-main/Cargo.toml b/raftstore-proxy-main/Cargo.toml
@@ -2,7 +2,7 @@
 name = "raftstore-proxy-main"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]

diff --git a/raftstore-proxy/Cargo.toml b/raftstore-proxy/Cargo.toml
@@ -2,7 +2,7 @@
 name = "raftstore-proxy"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]