You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67 lines
2.0 KiB
67 lines
2.0 KiB
1 month ago
|
From fa2d5f6cef59ecde008b893ce91432c8ac2a2f6c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
||
|
|
Date: Tue, 24 Sep 2024 19:15:00 +0200
|
||
|
|
Subject: [PATCH 3/6] remove unavailable custom allocators
|
||
|
|
|
||
|
|
---
|
||
|
|
Cargo.toml | 1 -
|
||
|
|
crates/ruff/Cargo.toml | 3 ---
|
||
|
|
crates/ruff/src/main.rs | 16 ----------------
|
||
|
|
3 files changed, 20 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
||
|
|
index 72cb35c..115a515 100644
|
||
|
|
--- a/Cargo.toml
|
||
|
|
+++ b/Cargo.toml
|
||
|
|
@@ -130,7 +130,6 @@ syn = { version = "2.0.55" }
|
||
|
|
tempfile = { version = "3.9.0" }
|
||
|
|
test-case = { version = "3.3.1" }
|
||
|
|
thiserror = { version = "1.0.58" }
|
||
|
|
-tikv-jemallocator = { version = "0.6.0" }
|
||
|
|
toml = { version = "0.8.11" }
|
||
|
|
tracing = { version = "0.1.40" }
|
||
|
|
tracing-flame = { version = "0.2.0" }
|
||
|
|
diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml
|
||
|
|
index fb3fb93..cdc9b78 100644
|
||
|
|
--- a/crates/ruff/Cargo.toml
|
||
|
|
+++ b/crates/ruff/Cargo.toml
|
||
|
|
@@ -76,8 +76,5 @@ test-case = { workspace = true }
|
||
|
|
# Used via macro expansion.
|
||
|
|
ignored = ["chrono"]
|
||
|
|
|
||
|
|
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies]
|
||
|
|
-tikv-jemallocator = { workspace = true }
|
||
|
|
-
|
||
|
|
[lints]
|
||
|
|
workspace = true
|
||
|
|
diff --git a/crates/ruff/src/main.rs b/crates/ruff/src/main.rs
|
||
|
|
index 27b2fad..ef6887f 100644
|
||
|
|
--- a/crates/ruff/src/main.rs
|
||
|
|
+++ b/crates/ruff/src/main.rs
|
||
|
|
@@ -8,22 +8,6 @@ use ruff::args::{Args, Command};
|
||
|
|
use ruff::{run, ExitStatus};
|
||
|
|
use ruff_linter::logging::{set_up_logging, LogLevel};
|
||
|
|
|
||
|
|
-#[cfg(target_os = "windows")]
|
||
|
|
-#[global_allocator]
|
||
|
|
-static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
|
||
|
|
-
|
||
|
|
-#[cfg(all(
|
||
|
|
- not(target_os = "windows"),
|
||
|
|
- not(target_os = "openbsd"),
|
||
|
|
- any(
|
||
|
|
- target_arch = "x86_64",
|
||
|
|
- target_arch = "aarch64",
|
||
|
|
- target_arch = "powerpc64"
|
||
|
|
- )
|
||
|
|
-))]
|
||
|
|
-#[global_allocator]
|
||
|
|
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
|
||
|
|
-
|
||
|
|
pub fn main() -> ExitCode {
|
||
|
|
// Enabled ANSI colors on Windows 10.
|
||
|
|
#[cfg(windows)]
|
||
|
|
--
|
||
|
|
2.46.1
|
||
|
|
|