This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch
feature/599-provide-and-use-c-service-in-rust
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/599-provide-and-use-c-service-in-rust by this push:
new dc81c7a6 Update Rust edition, remove extern crates
dc81c7a6 is described below
commit dc81c7a6157c807745d1442305e4066dfcdee3c3
Author: PengZheng <[email protected]>
AuthorDate: Sun Sep 17 11:28:37 2023 +0800
Update Rust edition, remove extern crates
---
misc/experimental/rust/celix/Cargo.toml | 1 +
misc/experimental/rust/celix/src/lib.rs | 2 --
misc/experimental/rust/celix/src/log_helper.rs | 2 +-
misc/experimental/rust/celix_bindings/Cargo.toml | 1 +
misc/experimental/rust/hello_world_activator/Cargo.toml | 1 +
misc/experimental/rust/hello_world_activator/src/lib.rs | 2 --
misc/experimental/rust/rust_shell_api/Cargo.toml | 1 +
misc/experimental/rust/rust_shell_api/src/lib.rs | 2 --
misc/experimental/rust/shell_command_bundle/Cargo.toml | 1 +
misc/experimental/rust/shell_command_bundle/src/lib.rs | 4 ----
10 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/misc/experimental/rust/celix/Cargo.toml
b/misc/experimental/rust/celix/Cargo.toml
index 4ae42766..fc355970 100644
--- a/misc/experimental/rust/celix/Cargo.toml
+++ b/misc/experimental/rust/celix/Cargo.toml
@@ -18,6 +18,7 @@
[package]
name = "celix"
version = "0.0.1"
+edition = '2021'
[dependencies]
celix_bindings = { path = "../celix_bindings" }
diff --git a/misc/experimental/rust/celix/src/lib.rs
b/misc/experimental/rust/celix/src/lib.rs
index 390a6280..5ad56717 100644
--- a/misc/experimental/rust/celix/src/lib.rs
+++ b/misc/experimental/rust/celix/src/lib.rs
@@ -17,8 +17,6 @@
* under the License.
*/
-extern crate celix_bindings;
-
// Re-export the celix_status_t and celix_bundle_context_t C API in this crate
public API so that
// it can be used in the generate_bundle_activator macro.
// Note that as result the celix rust lib is leaking the celix_status_t and
celix_bundle_context_t
diff --git a/misc/experimental/rust/celix/src/log_helper.rs
b/misc/experimental/rust/celix/src/log_helper.rs
index 16271c7b..e62238c3 100644
--- a/misc/experimental/rust/celix/src/log_helper.rs
+++ b/misc/experimental/rust/celix/src/log_helper.rs
@@ -23,7 +23,7 @@ use super::BundleContext;
use super::LogLevel;
use celix_bindings::celix_log_service_t;
-use ServiceTracker;
+use crate::ServiceTracker;
pub struct LogHelper {
name: String,
diff --git a/misc/experimental/rust/celix_bindings/Cargo.toml
b/misc/experimental/rust/celix_bindings/Cargo.toml
index b46868b9..22100253 100644
--- a/misc/experimental/rust/celix_bindings/Cargo.toml
+++ b/misc/experimental/rust/celix_bindings/Cargo.toml
@@ -18,6 +18,7 @@
[package]
name = "celix_bindings"
version = "0.0.1"
+edition = '2021'
[build-dependencies]
bindgen = "0.66.1"
diff --git a/misc/experimental/rust/hello_world_activator/Cargo.toml
b/misc/experimental/rust/hello_world_activator/Cargo.toml
index 191c5e96..378d5fb5 100644
--- a/misc/experimental/rust/hello_world_activator/Cargo.toml
+++ b/misc/experimental/rust/hello_world_activator/Cargo.toml
@@ -18,6 +18,7 @@
[package]
name = "rust_bundle"
version = "0.0.1"
+edition = '2021'
[dependencies]
celix = { path = "../celix" }
diff --git a/misc/experimental/rust/hello_world_activator/src/lib.rs
b/misc/experimental/rust/hello_world_activator/src/lib.rs
index 80d7b720..d59212c2 100644
--- a/misc/experimental/rust/hello_world_activator/src/lib.rs
+++ b/misc/experimental/rust/hello_world_activator/src/lib.rs
@@ -17,8 +17,6 @@
* under the License.
*/
-extern crate celix;
-
use std::sync::Arc;
use celix::BundleActivator;
diff --git a/misc/experimental/rust/rust_shell_api/Cargo.toml
b/misc/experimental/rust/rust_shell_api/Cargo.toml
index 71c4d41b..ed9c1c64 100644
--- a/misc/experimental/rust/rust_shell_api/Cargo.toml
+++ b/misc/experimental/rust/rust_shell_api/Cargo.toml
@@ -18,6 +18,7 @@
[package]
name = "rust_shell_api"
version = "0.0.1"
+edition = '2021'
[dependencies]
celix = { path = "../celix" }
diff --git a/misc/experimental/rust/rust_shell_api/src/lib.rs
b/misc/experimental/rust/rust_shell_api/src/lib.rs
index c75a7c09..18a6a406 100644
--- a/misc/experimental/rust/rust_shell_api/src/lib.rs
+++ b/misc/experimental/rust/rust_shell_api/src/lib.rs
@@ -17,8 +17,6 @@
* under the License.
*/
-extern crate celix;
-
use celix::Error;
pub const COMMAND_NAME: &str = "command.name";
pub const COMMAND_USAGE: &str = "command.usage";
diff --git a/misc/experimental/rust/shell_command_bundle/Cargo.toml
b/misc/experimental/rust/shell_command_bundle/Cargo.toml
index 0c11c180..aba9f73b 100644
--- a/misc/experimental/rust/shell_command_bundle/Cargo.toml
+++ b/misc/experimental/rust/shell_command_bundle/Cargo.toml
@@ -18,6 +18,7 @@
[package]
name = "rust_shell_command_activator"
version = "0.0.1"
+edition = '2021'
[dependencies]
celix_bindings = { path = "../celix_bindings" }
diff --git a/misc/experimental/rust/shell_command_bundle/src/lib.rs
b/misc/experimental/rust/shell_command_bundle/src/lib.rs
index 0889e386..9bd7f174 100644
--- a/misc/experimental/rust/shell_command_bundle/src/lib.rs
+++ b/misc/experimental/rust/shell_command_bundle/src/lib.rs
@@ -17,10 +17,6 @@
* under the License.
*/
-extern crate celix;
-extern crate celix_bindings;
-extern crate rust_shell_api;
-
use std::ffi::c_char;
use std::ffi::c_void;
use std::sync::Arc;
