From 37e1f35df815c053d7d70eb676f0f254e26294c5 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 25 Dec 2024 11:54:16 +0200 Subject: [PATCH] Fix Cargo.toml in macros crate --- Cargo.lock | 10 +++++----- core/Cargo.toml | 2 +- core/vdbe/mod.rs | 2 +- macros/Cargo.toml | 10 +++++++++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6053a3e93..0f034d89d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1138,8 +1138,8 @@ dependencies = [ "jsonb", "julian_day_converter", "libc", + "limbo_macros", "log", - "macros", "mimalloc", "mockall", "nix 0.29.0", @@ -1160,6 +1160,10 @@ dependencies = [ "uuid", ] +[[package]] +name = "limbo_macros" +version = "0.0.10" + [[package]] name = "limbo_sim" version = "0.0.10" @@ -1206,10 +1210,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "macros" -version = "0.0.0" - [[package]] name = "memchr" version = "2.7.4" diff --git a/core/Cargo.toml b/core/Cargo.toml index 4ef87b469..4d731eb2b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -54,7 +54,7 @@ pest = { version = "2.0", optional = true } pest_derive = { version = "2.0", optional = true } rand = "0.8.5" bumpalo = { version = "3.16.0", features = ["collections", "boxed"] } -macros = { path = "../macros" } +limbo_macros = { path = "../macros" } uuid = { version = "1.11.0", features = ["v4", "v7"], optional = true } [target.'cfg(not(target_family = "windows"))'.dev-dependencies] diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs index debabb067..427770155 100644 --- a/core/vdbe/mod.rs +++ b/core/vdbe/mod.rs @@ -40,7 +40,7 @@ use crate::util::parse_schema_rows; use crate::{function::JsonFunc, json::get_json, json::json_array}; use crate::{Connection, Result, TransactionState}; use crate::{Rows, DATABASE_VERSION}; -use macros::Description; +use limbo_macros::Description; use datetime::{exec_date, exec_time, exec_unixepoch}; diff --git a/macros/Cargo.toml b/macros/Cargo.toml index e3516da14..78a3805c6 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,5 +1,13 @@ +# Copyright 2024 the Limbo authors. All rights reserved. MIT license. + [package] -name = "macros" +name = "limbo_macros" +version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true +description = "The Limbo database library" [lib] proc-macro = true