Skip to content

Commit

Permalink
chore: bump zenoh version (eclipse-zenoh#122)
Browse files Browse the repository at this point in the history
* chore: bump zenoh version

* chore: update branch
  • Loading branch information
wyfo authored Jul 3, 2024
1 parent 4667d27 commit 41252bc
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 46 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ jobs:
rustup component add rustfmt clippy
- name: Code format check
run: cargo fmt --check

run: cargo fmt --check -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
- name: Clippy
run: cargo clippy --all --examples -- -D warnings

Expand Down
8 changes: 8 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
repos:
- repo: local
hooks:
- id: fmt
name: fmt
entry: cargo fmt -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
language: system
types: [rust]
53 changes: 26 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,13 @@ rocksdb = "0.22.0"
serde_json = "1.0.114"
tracing = "0.1"
uhlc = "0.7.0"
zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0", features = [
zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = [
"unstable",
"internal",
"plugins"
] }
zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" }
zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" }
zenoh-codec = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "dev/1.0.0" }
zenoh_backend_traits = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }
zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0" }

[build-dependencies]
rustc_version = "0.4.0"
Expand Down
27 changes: 14 additions & 13 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,25 @@
// ZettaScale Zenoh Team, <[email protected]>
//

use std::{borrow::Cow, collections::HashMap, path::PathBuf, time::Duration};

use async_std::sync::{Arc, Mutex};
use async_trait::async_trait;
use rocksdb::{ColumnFamilyDescriptor, Options, WriteBatch, DB};
use std::borrow::Cow;
use std::collections::HashMap;
use std::path::PathBuf;
use std::time::Duration;
use tracing::{debug, error, trace, warn};
use uhlc::NTP64;
use zenoh::bytes::ZBytes;
use zenoh::encoding::Encoding;
use zenoh::internal::{bail, zenoh_home, zerror, Value};
use zenoh::key_expr::OwnedKeyExpr;
use zenoh::selector::Parameters;
use zenoh::time::{new_timestamp, Timestamp};
use zenoh::{try_init_log_from_env, Error, Result as ZResult};
use zenoh_backend_traits::config::{StorageConfig, VolumeConfig};
use zenoh_backend_traits::*;
use zenoh::{
bytes::{Encoding, ZBytes},
internal::{bail, zenoh_home, zerror, Value},
key_expr::OwnedKeyExpr,
query::Parameters,
time::{new_timestamp, Timestamp},
try_init_log_from_env, Error, Result as ZResult,
};
use zenoh_backend_traits::{
config::{StorageConfig, VolumeConfig},
*,
};
use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin};

/// The environement variable used to configure the root of all storages managed by this RocksdbBackend.
Expand Down

0 comments on commit 41252bc

Please sign in to comment.