Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to paste 1 #11

Merged
merged 1 commit into from Aug 5, 2021
Merged

Update to paste 1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ tikv-jemalloc-sys = { path = "jemalloc-sys", version = "0.4.0", default-features
libc = { version = "^0.2.8", default-features = false }

[dev-dependencies]
paste = "0.1"
paste = "1"
tikv-jemalloc-ctl = { path = "jemalloc-ctl", version = "0.4" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion benches/roundtrip.rs
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ fn layout_to_flags(layout: &Layout) -> c_int {

macro_rules! rt {
($size:expr, $align:expr) => {
paste::item! {
paste::paste! {
#[bench]
fn [<rt_mallocx_size_ $size _align_ $align>](b: &mut Bencher) {
b.iter(|| unsafe {
Expand Down
2 changes: 1 addition & 1 deletion jemalloc-ctl/Cargo.toml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.4.0" }
libc = { version = "0.2", default-features = false }
paste = { version = "0.1" }
paste = "1"

[dev-dependencies]
tikv-jemallocator = { path = "..", version = "0.4.0" }
Expand Down
8 changes: 4 additions & 4 deletions jemalloc-ctl/src/macros.rs
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ macro_rules! types {
docs: $(#[$doc:meta])*
mib_docs: $(#[$doc_mib:meta])*
) => {
paste::item! {
paste::paste! {
$(#[$doc])*
#[allow(non_camel_case_types)]
pub struct $id;
Expand Down Expand Up @@ -44,7 +44,7 @@ macro_rules! types {
/// Read
macro_rules! r {
($id:ident => $ret_ty:ty) => {
paste::item! {
paste::paste! {
impl $id {
/// Reads value using string API.
pub fn read() -> crate::error::Result<$ret_ty> {
Expand Down Expand Up @@ -93,7 +93,7 @@ macro_rules! r {
/// Write
macro_rules! w {
($id:ident => $ret_ty:ty) => {
paste::item! {
paste::paste! {
impl $id {
/// Writes `value` using string API.
pub fn write(value: $ret_ty) -> crate::error::Result<()> {
Expand Down Expand Up @@ -142,7 +142,7 @@ macro_rules! w {
/// Update
macro_rules! u {
($id:ident => $ret_ty:ty) => {
paste::item! {
paste::paste! {
impl $id {
/// Updates key to `value` returning its old value using string API.
pub fn update(value: $ret_ty) -> crate::error::Result<$ret_ty> {
Expand Down