From ec4ef8384907d3749100771bb1cc92934272bcf9 Mon Sep 17 00:00:00 2001 From: "K.J. Valencik" Date: Wed, 13 Apr 2022 10:46:02 -0400 Subject: [PATCH] Move `neon` crate into `crates/neon` --- .cargo/config.toml | 2 +- Cargo.toml | 69 +------------------ crates/neon/Cargo.toml | 63 +++++++++++++++++ {src => crates/neon/src}/context/internal.rs | 0 {src => crates/neon/src}/context/mod.rs | 0 {src => crates/neon/src}/event/channel.rs | 0 {src => crates/neon/src}/event/mod.rs | 0 {src => crates/neon/src}/event/task.rs | 0 {src => crates/neon/src}/handle/internal.rs | 0 {src => crates/neon/src}/handle/mod.rs | 0 {src => crates/neon/src}/handle/root.rs | 0 {src => crates/neon/src}/lib.rs | 0 {src => crates/neon/src}/lifecycle.rs | 0 .../neon/src}/macro_internal/mod.rs | 0 {src => crates/neon/src}/meta.rs | 0 {src => crates/neon/src}/object/mod.rs | 0 {src => crates/neon/src}/prelude.rs | 0 {src => crates/neon/src}/reflect.rs | 0 {src => crates/neon/src}/result/mod.rs | 0 {src => crates/neon/src}/sys/array.rs | 0 {src => crates/neon/src}/sys/arraybuffer.rs | 0 {src => crates/neon/src}/sys/async_work.rs | 0 .../neon/src}/sys/bindings/functions.rs | 0 {src => crates/neon/src}/sys/bindings/mod.rs | 0 .../neon/src}/sys/bindings/types.rs | 0 {src => crates/neon/src}/sys/buffer.rs | 0 {src => crates/neon/src}/sys/call.rs | 0 {src => crates/neon/src}/sys/convert.rs | 0 {src => crates/neon/src}/sys/date.rs | 0 {src => crates/neon/src}/sys/error.rs | 0 {src => crates/neon/src}/sys/external.rs | 0 {src => crates/neon/src}/sys/fun.rs | 0 {src => crates/neon/src}/sys/lifecycle.rs | 0 {src => crates/neon/src}/sys/mem.rs | 0 {src => crates/neon/src}/sys/mod.rs | 0 {src => crates/neon/src}/sys/no_panic.rs | 0 {src => crates/neon/src}/sys/object.rs | 0 {src => crates/neon/src}/sys/primitive.rs | 0 {src => crates/neon/src}/sys/promise.rs | 0 {src => crates/neon/src}/sys/raw.rs | 0 {src => crates/neon/src}/sys/reference.rs | 0 {src => crates/neon/src}/sys/scope.rs | 0 {src => crates/neon/src}/sys/string.rs | 0 {src => crates/neon/src}/sys/tag.rs | 0 {src => crates/neon/src}/sys/tsfn.rs | 0 {src => crates/neon/src}/sys/typedarray.rs | 0 {src => crates/neon/src}/types/boxed.rs | 0 {src => crates/neon/src}/types/buffer/lock.rs | 0 {src => crates/neon/src}/types/buffer/mod.rs | 0 .../neon/src}/types/buffer/types.rs | 0 {src => crates/neon/src}/types/date.rs | 0 {src => crates/neon/src}/types/error.rs | 0 .../neon/src}/types/function/mod.rs | 0 .../neon/src}/types/function/private.rs | 0 {src => crates/neon/src}/types/mod.rs | 0 {src => crates/neon/src}/types/private.rs | 0 {src => crates/neon/src}/types/promise.rs | 0 {src => crates/neon/src}/types/utf8.rs | 0 test/electron/Cargo.toml | 2 +- test/napi/Cargo.toml | 2 +- 60 files changed, 68 insertions(+), 70 deletions(-) create mode 100644 crates/neon/Cargo.toml rename {src => crates/neon/src}/context/internal.rs (100%) rename {src => crates/neon/src}/context/mod.rs (100%) rename {src => crates/neon/src}/event/channel.rs (100%) rename {src => crates/neon/src}/event/mod.rs (100%) rename {src => crates/neon/src}/event/task.rs (100%) rename {src => crates/neon/src}/handle/internal.rs (100%) rename {src => crates/neon/src}/handle/mod.rs (100%) rename {src => crates/neon/src}/handle/root.rs (100%) rename {src => crates/neon/src}/lib.rs (100%) rename {src => crates/neon/src}/lifecycle.rs (100%) rename {src => crates/neon/src}/macro_internal/mod.rs (100%) rename {src => crates/neon/src}/meta.rs (100%) rename {src => crates/neon/src}/object/mod.rs (100%) rename {src => crates/neon/src}/prelude.rs (100%) rename {src => crates/neon/src}/reflect.rs (100%) rename {src => crates/neon/src}/result/mod.rs (100%) rename {src => crates/neon/src}/sys/array.rs (100%) rename {src => crates/neon/src}/sys/arraybuffer.rs (100%) rename {src => crates/neon/src}/sys/async_work.rs (100%) rename {src => crates/neon/src}/sys/bindings/functions.rs (100%) rename {src => crates/neon/src}/sys/bindings/mod.rs (100%) rename {src => crates/neon/src}/sys/bindings/types.rs (100%) rename {src => crates/neon/src}/sys/buffer.rs (100%) rename {src => crates/neon/src}/sys/call.rs (100%) rename {src => crates/neon/src}/sys/convert.rs (100%) rename {src => crates/neon/src}/sys/date.rs (100%) rename {src => crates/neon/src}/sys/error.rs (100%) rename {src => crates/neon/src}/sys/external.rs (100%) rename {src => crates/neon/src}/sys/fun.rs (100%) rename {src => crates/neon/src}/sys/lifecycle.rs (100%) rename {src => crates/neon/src}/sys/mem.rs (100%) rename {src => crates/neon/src}/sys/mod.rs (100%) rename {src => crates/neon/src}/sys/no_panic.rs (100%) rename {src => crates/neon/src}/sys/object.rs (100%) rename {src => crates/neon/src}/sys/primitive.rs (100%) rename {src => crates/neon/src}/sys/promise.rs (100%) rename {src => crates/neon/src}/sys/raw.rs (100%) rename {src => crates/neon/src}/sys/reference.rs (100%) rename {src => crates/neon/src}/sys/scope.rs (100%) rename {src => crates/neon/src}/sys/string.rs (100%) rename {src => crates/neon/src}/sys/tag.rs (100%) rename {src => crates/neon/src}/sys/tsfn.rs (100%) rename {src => crates/neon/src}/sys/typedarray.rs (100%) rename {src => crates/neon/src}/types/boxed.rs (100%) rename {src => crates/neon/src}/types/buffer/lock.rs (100%) rename {src => crates/neon/src}/types/buffer/mod.rs (100%) rename {src => crates/neon/src}/types/buffer/types.rs (100%) rename {src => crates/neon/src}/types/date.rs (100%) rename {src => crates/neon/src}/types/error.rs (100%) rename {src => crates/neon/src}/types/function/mod.rs (100%) rename {src => crates/neon/src}/types/function/private.rs (100%) rename {src => crates/neon/src}/types/mod.rs (100%) rename {src => crates/neon/src}/types/private.rs (100%) rename {src => crates/neon/src}/types/promise.rs (100%) rename {src => crates/neon/src}/types/utf8.rs (100%) diff --git a/.cargo/config.toml b/.cargo/config.toml index 8d1b782cc..1e621e083 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -4,4 +4,4 @@ neon-check = " check --all --all-targets --features napi-experimental" neon-clippy = "clippy --all --all-targets --features napi-experimental -- -A clippy::missing_safety_doc" neon-test = " test --all --features=napi-experimental" -neon-doc = " rustdoc --features=napi-experimental -- --cfg docsrs" +neon-doc = " rustdoc -p neon --features=napi-experimental -- --cfg docsrs" diff --git a/Cargo.toml b/Cargo.toml index 826306dbc..937e60cb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,70 +1,5 @@ -[package] -name = "neon" -version = "0.10.0" -authors = ["Dave Herman "] -description = "A safe abstraction layer for Node.js." -readme = "README.md" -homepage = "https://www.neon-bindings.com" -repository = "https://github.com/neon-bindings/neon" -license = "MIT/Apache-2.0" -exclude = ["neon.jpg", "doc/**/*"] -edition = "2018" - -[dev-dependencies] -nodejs-sys = "0.13.0" -semver = "0.9" -psd = "0.1.9" # used for a doc example -failure = "0.1.5" # used for a doc example - -[dependencies] -libloading = "0.7.3" -semver = "0.9.0" -smallvec = "1.4.2" -neon-macros = { version = "=0.10.0", path = "crates/neon-macros" } - -[features] -default = ["napi-1"] - -# Default N-API version. Prefer to select a minimum required version. -# DEPRECATED: This is an alias that should be removed -napi-runtime = ["napi-8"] - -# Select the N-API version -# Feature flags to enable the experimental N-API runtime. For now, this feature -# is disabled by default. -# The Node N-API documentation specifies N-API and Node version requirements -# https://nodejs.org/api/n-api.html -napi-1 = [] -napi-2 = ["napi-1"] -napi-3 = ["napi-2"] -napi-4 = ["napi-3"] -napi-5 = ["napi-4"] -napi-6 = ["napi-5"] -napi-7 = ["napi-6"] -napi-8 = ["napi-7"] -napi-latest = ["napi-8"] -napi-experimental = ["napi-8"] - -# DEPRECATED: These perform no action and will be removed in 1.0 -try-catch-api = [] -channel-api = [] -event-queue-api = [] -promise-api = [] -task-api = [] - -# Feature flag to include procedural macros -# DEPRECATED: This is always enabled and should be removed. -proc-macros = [] - -[package.metadata.docs.rs] -rustdoc-args = ["--cfg", "docsrs"] -features = [ - "napi-experimental", -] - [workspace] members = [ - "crates/neon-macros", - "test/electron", - "test/napi" + "crates/*", + "test/*", ] diff --git a/crates/neon/Cargo.toml b/crates/neon/Cargo.toml new file mode 100644 index 000000000..3f1b0faef --- /dev/null +++ b/crates/neon/Cargo.toml @@ -0,0 +1,63 @@ +[package] +name = "neon" +version = "0.10.0" +authors = ["Dave Herman "] +description = "A safe abstraction layer for Node.js." +readme = "README.md" +homepage = "https://www.neon-bindings.com" +repository = "https://github.com/neon-bindings/neon" +license = "MIT/Apache-2.0" +exclude = ["neon.jpg", "doc/**/*"] +edition = "2018" + +[dev-dependencies] +nodejs-sys = "0.13.0" +semver = "0.9" +psd = "0.1.9" # used for a doc example +failure = "0.1.5" # used for a doc example + +[dependencies] +libloading = "0.7.3" +semver = "0.9.0" +smallvec = "1.4.2" +neon-macros = { version = "=0.10.0", path = "../neon-macros" } + +[features] +default = ["napi-1"] + +# Default N-API version. Prefer to select a minimum required version. +# DEPRECATED: This is an alias that should be removed +napi-runtime = ["napi-8"] + +# Select the N-API version +# Feature flags to enable the experimental N-API runtime. For now, this feature +# is disabled by default. +# The Node N-API documentation specifies N-API and Node version requirements +# https://nodejs.org/api/n-api.html +napi-1 = [] +napi-2 = ["napi-1"] +napi-3 = ["napi-2"] +napi-4 = ["napi-3"] +napi-5 = ["napi-4"] +napi-6 = ["napi-5"] +napi-7 = ["napi-6"] +napi-8 = ["napi-7"] +napi-latest = ["napi-8"] +napi-experimental = ["napi-8"] + +# DEPRECATED: These perform no action and will be removed in 1.0 +try-catch-api = [] +channel-api = [] +event-queue-api = [] +promise-api = [] +task-api = [] + +# Feature flag to include procedural macros +# DEPRECATED: This is always enabled and should be removed. +proc-macros = [] + +[package.metadata.docs.rs] +rustdoc-args = ["--cfg", "docsrs"] +features = [ + "napi-experimental", +] diff --git a/src/context/internal.rs b/crates/neon/src/context/internal.rs similarity index 100% rename from src/context/internal.rs rename to crates/neon/src/context/internal.rs diff --git a/src/context/mod.rs b/crates/neon/src/context/mod.rs similarity index 100% rename from src/context/mod.rs rename to crates/neon/src/context/mod.rs diff --git a/src/event/channel.rs b/crates/neon/src/event/channel.rs similarity index 100% rename from src/event/channel.rs rename to crates/neon/src/event/channel.rs diff --git a/src/event/mod.rs b/crates/neon/src/event/mod.rs similarity index 100% rename from src/event/mod.rs rename to crates/neon/src/event/mod.rs diff --git a/src/event/task.rs b/crates/neon/src/event/task.rs similarity index 100% rename from src/event/task.rs rename to crates/neon/src/event/task.rs diff --git a/src/handle/internal.rs b/crates/neon/src/handle/internal.rs similarity index 100% rename from src/handle/internal.rs rename to crates/neon/src/handle/internal.rs diff --git a/src/handle/mod.rs b/crates/neon/src/handle/mod.rs similarity index 100% rename from src/handle/mod.rs rename to crates/neon/src/handle/mod.rs diff --git a/src/handle/root.rs b/crates/neon/src/handle/root.rs similarity index 100% rename from src/handle/root.rs rename to crates/neon/src/handle/root.rs diff --git a/src/lib.rs b/crates/neon/src/lib.rs similarity index 100% rename from src/lib.rs rename to crates/neon/src/lib.rs diff --git a/src/lifecycle.rs b/crates/neon/src/lifecycle.rs similarity index 100% rename from src/lifecycle.rs rename to crates/neon/src/lifecycle.rs diff --git a/src/macro_internal/mod.rs b/crates/neon/src/macro_internal/mod.rs similarity index 100% rename from src/macro_internal/mod.rs rename to crates/neon/src/macro_internal/mod.rs diff --git a/src/meta.rs b/crates/neon/src/meta.rs similarity index 100% rename from src/meta.rs rename to crates/neon/src/meta.rs diff --git a/src/object/mod.rs b/crates/neon/src/object/mod.rs similarity index 100% rename from src/object/mod.rs rename to crates/neon/src/object/mod.rs diff --git a/src/prelude.rs b/crates/neon/src/prelude.rs similarity index 100% rename from src/prelude.rs rename to crates/neon/src/prelude.rs diff --git a/src/reflect.rs b/crates/neon/src/reflect.rs similarity index 100% rename from src/reflect.rs rename to crates/neon/src/reflect.rs diff --git a/src/result/mod.rs b/crates/neon/src/result/mod.rs similarity index 100% rename from src/result/mod.rs rename to crates/neon/src/result/mod.rs diff --git a/src/sys/array.rs b/crates/neon/src/sys/array.rs similarity index 100% rename from src/sys/array.rs rename to crates/neon/src/sys/array.rs diff --git a/src/sys/arraybuffer.rs b/crates/neon/src/sys/arraybuffer.rs similarity index 100% rename from src/sys/arraybuffer.rs rename to crates/neon/src/sys/arraybuffer.rs diff --git a/src/sys/async_work.rs b/crates/neon/src/sys/async_work.rs similarity index 100% rename from src/sys/async_work.rs rename to crates/neon/src/sys/async_work.rs diff --git a/src/sys/bindings/functions.rs b/crates/neon/src/sys/bindings/functions.rs similarity index 100% rename from src/sys/bindings/functions.rs rename to crates/neon/src/sys/bindings/functions.rs diff --git a/src/sys/bindings/mod.rs b/crates/neon/src/sys/bindings/mod.rs similarity index 100% rename from src/sys/bindings/mod.rs rename to crates/neon/src/sys/bindings/mod.rs diff --git a/src/sys/bindings/types.rs b/crates/neon/src/sys/bindings/types.rs similarity index 100% rename from src/sys/bindings/types.rs rename to crates/neon/src/sys/bindings/types.rs diff --git a/src/sys/buffer.rs b/crates/neon/src/sys/buffer.rs similarity index 100% rename from src/sys/buffer.rs rename to crates/neon/src/sys/buffer.rs diff --git a/src/sys/call.rs b/crates/neon/src/sys/call.rs similarity index 100% rename from src/sys/call.rs rename to crates/neon/src/sys/call.rs diff --git a/src/sys/convert.rs b/crates/neon/src/sys/convert.rs similarity index 100% rename from src/sys/convert.rs rename to crates/neon/src/sys/convert.rs diff --git a/src/sys/date.rs b/crates/neon/src/sys/date.rs similarity index 100% rename from src/sys/date.rs rename to crates/neon/src/sys/date.rs diff --git a/src/sys/error.rs b/crates/neon/src/sys/error.rs similarity index 100% rename from src/sys/error.rs rename to crates/neon/src/sys/error.rs diff --git a/src/sys/external.rs b/crates/neon/src/sys/external.rs similarity index 100% rename from src/sys/external.rs rename to crates/neon/src/sys/external.rs diff --git a/src/sys/fun.rs b/crates/neon/src/sys/fun.rs similarity index 100% rename from src/sys/fun.rs rename to crates/neon/src/sys/fun.rs diff --git a/src/sys/lifecycle.rs b/crates/neon/src/sys/lifecycle.rs similarity index 100% rename from src/sys/lifecycle.rs rename to crates/neon/src/sys/lifecycle.rs diff --git a/src/sys/mem.rs b/crates/neon/src/sys/mem.rs similarity index 100% rename from src/sys/mem.rs rename to crates/neon/src/sys/mem.rs diff --git a/src/sys/mod.rs b/crates/neon/src/sys/mod.rs similarity index 100% rename from src/sys/mod.rs rename to crates/neon/src/sys/mod.rs diff --git a/src/sys/no_panic.rs b/crates/neon/src/sys/no_panic.rs similarity index 100% rename from src/sys/no_panic.rs rename to crates/neon/src/sys/no_panic.rs diff --git a/src/sys/object.rs b/crates/neon/src/sys/object.rs similarity index 100% rename from src/sys/object.rs rename to crates/neon/src/sys/object.rs diff --git a/src/sys/primitive.rs b/crates/neon/src/sys/primitive.rs similarity index 100% rename from src/sys/primitive.rs rename to crates/neon/src/sys/primitive.rs diff --git a/src/sys/promise.rs b/crates/neon/src/sys/promise.rs similarity index 100% rename from src/sys/promise.rs rename to crates/neon/src/sys/promise.rs diff --git a/src/sys/raw.rs b/crates/neon/src/sys/raw.rs similarity index 100% rename from src/sys/raw.rs rename to crates/neon/src/sys/raw.rs diff --git a/src/sys/reference.rs b/crates/neon/src/sys/reference.rs similarity index 100% rename from src/sys/reference.rs rename to crates/neon/src/sys/reference.rs diff --git a/src/sys/scope.rs b/crates/neon/src/sys/scope.rs similarity index 100% rename from src/sys/scope.rs rename to crates/neon/src/sys/scope.rs diff --git a/src/sys/string.rs b/crates/neon/src/sys/string.rs similarity index 100% rename from src/sys/string.rs rename to crates/neon/src/sys/string.rs diff --git a/src/sys/tag.rs b/crates/neon/src/sys/tag.rs similarity index 100% rename from src/sys/tag.rs rename to crates/neon/src/sys/tag.rs diff --git a/src/sys/tsfn.rs b/crates/neon/src/sys/tsfn.rs similarity index 100% rename from src/sys/tsfn.rs rename to crates/neon/src/sys/tsfn.rs diff --git a/src/sys/typedarray.rs b/crates/neon/src/sys/typedarray.rs similarity index 100% rename from src/sys/typedarray.rs rename to crates/neon/src/sys/typedarray.rs diff --git a/src/types/boxed.rs b/crates/neon/src/types/boxed.rs similarity index 100% rename from src/types/boxed.rs rename to crates/neon/src/types/boxed.rs diff --git a/src/types/buffer/lock.rs b/crates/neon/src/types/buffer/lock.rs similarity index 100% rename from src/types/buffer/lock.rs rename to crates/neon/src/types/buffer/lock.rs diff --git a/src/types/buffer/mod.rs b/crates/neon/src/types/buffer/mod.rs similarity index 100% rename from src/types/buffer/mod.rs rename to crates/neon/src/types/buffer/mod.rs diff --git a/src/types/buffer/types.rs b/crates/neon/src/types/buffer/types.rs similarity index 100% rename from src/types/buffer/types.rs rename to crates/neon/src/types/buffer/types.rs diff --git a/src/types/date.rs b/crates/neon/src/types/date.rs similarity index 100% rename from src/types/date.rs rename to crates/neon/src/types/date.rs diff --git a/src/types/error.rs b/crates/neon/src/types/error.rs similarity index 100% rename from src/types/error.rs rename to crates/neon/src/types/error.rs diff --git a/src/types/function/mod.rs b/crates/neon/src/types/function/mod.rs similarity index 100% rename from src/types/function/mod.rs rename to crates/neon/src/types/function/mod.rs diff --git a/src/types/function/private.rs b/crates/neon/src/types/function/private.rs similarity index 100% rename from src/types/function/private.rs rename to crates/neon/src/types/function/private.rs diff --git a/src/types/mod.rs b/crates/neon/src/types/mod.rs similarity index 100% rename from src/types/mod.rs rename to crates/neon/src/types/mod.rs diff --git a/src/types/private.rs b/crates/neon/src/types/private.rs similarity index 100% rename from src/types/private.rs rename to crates/neon/src/types/private.rs diff --git a/src/types/promise.rs b/crates/neon/src/types/promise.rs similarity index 100% rename from src/types/promise.rs rename to crates/neon/src/types/promise.rs diff --git a/src/types/utf8.rs b/crates/neon/src/types/utf8.rs similarity index 100% rename from src/types/utf8.rs rename to crates/neon/src/types/utf8.rs diff --git a/test/electron/Cargo.toml b/test/electron/Cargo.toml index e68b26f8c..c7dbf9ce3 100644 --- a/test/electron/Cargo.toml +++ b/test/electron/Cargo.toml @@ -10,4 +10,4 @@ crate-type = ["cdylib"] [dependencies.neon] version = "*" -path = "../.." +path = "../../crates/neon" diff --git a/test/napi/Cargo.toml b/test/napi/Cargo.toml index ecc8b66c7..0922d48e1 100644 --- a/test/napi/Cargo.toml +++ b/test/napi/Cargo.toml @@ -14,5 +14,5 @@ once_cell = "1" [dependencies.neon] version = "*" -path = "../.." +path = "../../crates/neon" features = ["napi-8"]