Skip to content

Commit

Permalink
Update dependencies (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
fafhrd91 authored Mar 25, 2024
1 parent 6b9ffc2 commit 02dc401
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 114 deletions.
17 changes: 6 additions & 11 deletions examples/custom/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,13 @@ name = "client"
path = "src/client.rs"

[dependencies]
ntex = "1.0.0-b.0"
ntex-h2 = "0.5.0-b.0"
ntex-grpc = "0.6.0-b.0"
ntex = "1.0"
ntex-h2 = "0.5"
ntex-grpc = "0.6"

clap = "3.2"
bitflags = "2.1"
log = "0.4"
env_logger = "0.10"
num_cpus = "1"
openssl = "0.10"
env_logger = "0.11"
uuid = { version = "1.3", features = ["v4"] }

[dev-dependencies]
env_logger = { version = "0.10", default-features = false }
ntex = { version = "1.0.0-b.0", features = ["openssl", "tokio"] }
env_logger = "0.11"
ntex = { version = "1.0", features = ["openssl", "tokio"] }
12 changes: 4 additions & 8 deletions examples/helloworld/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,14 @@ name = "server"
path = "src/server.rs"

[dependencies]
ntex = "1.0.0-b.0"
ntex-grpc = "0.6.0-b.0"
ntex-h2 = "0.5.0-b.0"
ntex = "1.0"
ntex-grpc = "0.6"
ntex-h2 = "0.5"

clap = "2"
bitflags = "1.3"
log = "0.4"
env_logger = "0.10"
num_cpus = "1"
openssl = "0.10"

[dev-dependencies]
ntex = { version = "1.0.0-b.0", features = ["openssl", "tokio"] }
ntex-tls = { version = "1.0.0-b.0", features = ["openssl"] }
ntex-connect = { version = "1.0.0-b.0", features = ["openssl", "tokio"] }
ntex = { version = "1.0", features = ["openssl", "tokio"] }
4 changes: 4 additions & 0 deletions ntex-grpc/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changes

## [0.6.3] - 2024-03-25

* Remove ntex-connect dependency

## [0.6.2] - 2024-02-01

* Handle broken protobuf frames
Expand Down
8 changes: 2 additions & 6 deletions ntex-grpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ntex-grpc"
version = "0.6.2"
version = "0.6.3"
license = "MIT OR Apache-2.0"
authors = ["Nikolay Kim <[email protected]>"]
description = "GRPC Client/Server framework"
Expand All @@ -18,12 +18,10 @@ path = "src/lib.rs"
[dependencies]
ntex-h2 = "0.5"
ntex-http = "0.1"
ntex-connect = "1.0"
ntex-io = "1.0"
ntex-util = "1.0"
ntex-bytes = "0.1.24"
ntex-bytes = "0.1"
ntex-service = "2.0"
ntex-rt = "0.4"
ntex-grpc-derive = "0.6"

log = "0.4"
Expand All @@ -33,6 +31,4 @@ pin-project-lite = "0.2"
[dev-dependencies]
openssl = "0.10"
ntex = { version = "1.0", features = ["openssl", "tokio"] }
ntex-tls = { version = "1.0", features = ["openssl"] }
ntex-connect = { version = "1.0", features = ["openssl", "tokio"] }
env_logger = { version = "0.10", default-features = false }
84 changes: 0 additions & 84 deletions ntex-grpc/src/client/connector.rs

This file was deleted.

2 changes: 1 addition & 1 deletion ntex-grpc/src/server/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ where
}
let data = data
.split_to_checked(len as usize)
.ok_or_else(|| h2::StreamError::Reset(Reason::PROTOCOL_ERROR))?;
.ok_or(h2::StreamError::Reset(Reason::PROTOCOL_ERROR))?;

log::debug!("Call service {} method {}", inflight.service, inflight.name);
let req = ServerRequest {
Expand Down
2 changes: 1 addition & 1 deletion prost-build/src/extern_paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ impl ExternPaths {
// protoc should always give fully qualified identifiers.
assert_eq!(".", &pb_ident[..1]);

self.extern_paths.get(pb_ident).is_some()
self.extern_paths.contains_key(pb_ident)
}

pub fn resolve_ident(&self, pb_ident: &str) -> Option<String> {
Expand Down
3 changes: 0 additions & 3 deletions prost-build/src/ident.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ pub fn to_upper_camel(s: &str) -> String {

#[cfg(test)]
mod tests {

#![allow(clippy::cognitive_complexity)]

use super::*;

#[test]
Expand Down

0 comments on commit 02dc401

Please sign in to comment.