Skip to content

Commit d4411d7

Browse files
authored
*: bump 0.5.0 (#26)
Signed-off-by: Jay Lee <[email protected]>
1 parent ab0676d commit d4411d7

File tree

11 files changed

+31
-20
lines changed

11 files changed

+31
-20
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
name: CI
22

3-
on: [pull_request]
3+
on:
4+
pull_request:
5+
branches:
6+
- 'master'
7+
- 'main'
8+
push:
9+
branches:
10+
- 'master'
11+
- 'main'
412

513
jobs:
614
test:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.5.0 - 2022-05-19
2+
3+
- Update jemalloc to 5.3.0 (#23)
4+
15
# 0.4.3 - 2022-02-21
26

37
- Added riscv64 support (#14)

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
[![ci]][github actions] [![Latest Version]][crates.io] [![docs]][docs.rs]
44

5-
This project is a simplified fork of [jemallocator](https://github.com/gnzlbg/jemallocator) focus on server.
5+
This project is the successor of [jemallocator](https://github.com/gnzlbg/jemallocator).
6+
7+
The project is published as `tikv-jemallocator` and `jemallocator` for historical reasons. The two crates are the same except names. It's OK to use either crate. But due to lack of permissions, only `jemallocator` and `jemalloc-sys` are updated. If you want to use other crates, `tikv-xxx` versions are still required.
68

79
> Links against `jemalloc` and provides a `Jemalloc` unit type that implements
810
> the allocator APIs and can be set as the `#[global_allocator]`
@@ -28,7 +30,7 @@ To use `tikv-jemallocator` add it as a dependency:
2830
[dependencies]
2931

3032
[target.'cfg(not(target_env = "msvc"))'.dependencies]
31-
tikv-jemallocator = "0.4.3"
33+
tikv-jemallocator = "0.5"
3234
```
3335

3436
To set `tikv_jemallocator::Jemalloc` as the global allocator add this to your project:

jemalloc-ctl/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tikv-jemalloc-ctl"
3-
version = "0.4.3"
3+
version = "0.5.0"
44
authors = [
55
"Steven Fackler <[email protected]>",
66
"Gonzalo Brito Gadeschi <[email protected]>",
@@ -26,12 +26,12 @@ is-it-maintained-open-issues = { repository = "tikv/jemallocator" }
2626
maintenance = { status = "actively-developed" }
2727

2828
[dependencies]
29-
tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0" }
29+
tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.5.0" }
3030
libc = { version = "0.2", default-features = false }
3131
paste = "1"
3232

3333
[dev-dependencies]
34-
tikv-jemallocator = { path = "../jemallocator", version = "0.4.0" }
34+
tikv-jemallocator = { path = "../jemallocator", version = "0.5.0" }
3535

3636
[features]
3737
default = []

jemalloc-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tikv-jemalloc-sys"
3-
version = "0.4.3+5.3.0"
3+
version = "0.5.0+5.3.0"
44
authors = [
55
"Alex Crichton <[email protected]>",
66
"Gonzalo Brito Gadeschi <[email protected]>",

jemalloc-sys/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ fn main() {
136136
.to_str()
137137
.unwrap()
138138
.replace("C:\\", "/c/")
139-
.replace("\\", "/"),
139+
.replace('\\', "/"),
140140
)
141141
.current_dir(&build_dir)
142142
.env("CC", compiler.path())

jemallocator-global/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "tikv-jemallocator-global"
33
# Make sure to update the version in the readme as well:
4-
version = "0.4.3"
4+
version = "0.5.0"
55
authors = [
66
"Gonzalo Brito Gadeschi <[email protected]>",
77
"The TiKV Project Developers",
@@ -26,7 +26,7 @@ is-it-maintained-open-issues = { repository = "tikv/jemallocator" }
2626
maintenance = { status = "actively-developed" }
2727

2828
[dependencies]
29-
tikv-jemallocator = { version = "0.4.0", path = "../jemallocator", optional = true }
29+
tikv-jemallocator = { version = "0.5.0", path = "../jemallocator", optional = true }
3030
cfg-if = "0.1"
3131

3232
[features]
@@ -38,7 +38,7 @@ force_global_jemalloc = [ "tikv-jemallocator" ]
3838
# for a particular target, white-list the target explicitly here:
3939

4040
[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
41-
tikv-jemallocator = { version = "0.4.0", path = "../jemallocator", optional = false }
41+
tikv-jemallocator = { version = "0.5.0", path = "../jemallocator", optional = false }
4242

4343
# FIXME: https://github.com/gnzlbg/jemallocator/issues/91
4444
# [target.'cfg(target_os = "windows")'.dependencies]

jemallocator-global/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Add it as a dependency:
1111
```toml
1212
# Cargo.toml
1313
[dependencies]
14-
tikv-jemallocator-global = "0.4.0"
14+
tikv-jemallocator-global = "0.5.0"
1515
```
1616

1717
and `jemalloc` will be used as the `#[global_allocator]` on targets that support

jemallocator-global/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! ```toml
66
//! # Cargo.toml
77
//! [dependencies]
8-
//! jemallocator-global = "0.4.0"
8+
//! jemallocator-global = "0.5.0"
99
//! ```
1010
//!
1111
//! and `jemalloc` will be used as the `#[global_allocator]` on targets that

jemallocator/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "tikv-jemallocator"
33
# Make sure to update the version in the README as well:
4-
version = "0.4.3"
4+
version = "0.5.0"
55
authors = [
66
"Alex Crichton <[email protected]>",
77
"Gonzalo Brito Gadeschi <[email protected]>",
@@ -33,12 +33,12 @@ test = false
3333
bench = false
3434

3535
[dependencies]
36-
tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0", default-features = false }
36+
tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.5.0", default-features = false }
3737
libc = { version = "^0.2.8", default-features = false }
3838

3939
[dev-dependencies]
4040
paste = "1"
41-
tikv-jemalloc-ctl = { path = "../jemalloc-ctl", version = "0.4.0" }
41+
tikv-jemalloc-ctl = { path = "../jemalloc-ctl", version = "0.5.0" }
4242

4343
[features]
4444
default = ["background_threads_runtime_support"]

jemallocator/tests/background_thread_enabled.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,5 @@ pub static malloc_conf: Option<&'static libc::c_char> = Some(unsafe {
2828
#[test]
2929
fn background_threads_enabled() {
3030
// Background threads are unconditionally enabled at run-time by default.
31-
assert_eq!(
32-
tikv_jemalloc_ctl::opt::background_thread::read().unwrap(),
33-
true
34-
);
31+
assert!(tikv_jemalloc_ctl::opt::background_thread::read().unwrap(),);
3532
}

0 commit comments

Comments
 (0)