Skip to content

Commit

Permalink
Merge branch 'main' into better-stream-impl
Browse files Browse the repository at this point in the history
  • Loading branch information
paolobarbolini committed Sep 2, 2023
2 parents ecd9902 + 8661572 commit 981a6b5
Show file tree
Hide file tree
Showing 32 changed files with 1,576 additions and 384 deletions.
1 change: 1 addition & 0 deletions .config/nats.dic
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,4 @@ filter_subject
filter_subjects
rollup
IoT
ObjectMeta
5 changes: 0 additions & 5 deletions .github/ISSUE_TEMPLATE/blank_issue.md

This file was deleted.

58 changes: 0 additions & 58 deletions .github/ISSUE_TEMPLATE/bugs.yml

This file was deleted.

9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
blank_issues_enabled: true
blank_issues_enabled: false
contact_links:
- name: NATS Slack
- name: Discussion
url: https://github.com/nats-io/nats.rs/discussions
about: Ideal for ideas, feedback, or longer form questions.
- name: Chat
url: https://slack.nats.io
about: Please ask and answer questions in the rust channel here.
about: Ideal for short, one-off questions, general conversation, and meeting other NATS users!
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/defect.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: Defect
description: Report a defect, such as a bug or regression.
labels:
- defect
body:
- type: textarea
id: versions
attributes:
label: What version were you using?
description: Include the server version (`nats-server --version`) and any client versions when observing the issue.
validations:
required: true
- type: textarea
id: environment
attributes:
label: What environment was the server running in?
description: This pertains to the operating system, CPU architecture, and/or Docker image that was used.
validations:
required: true
- type: textarea
id: steps
attributes:
label: Is this defect reproducible?
description: Provide best-effort steps to showcase the defect.
validations:
required: true
- type: textarea
id: expected
attributes:
label: Given the capability you are leveraging, describe your expectation?
description: This may be the expected behavior or performance characteristics.
validations:
required: true
- type: textarea
id: actual
attributes:
label: Given the expectation, what is the defect you are observing?
description: This may be an unexpected behavior or regression in performance.
validations:
required: true
36 changes: 0 additions & 36 deletions .github/ISSUE_TEMPLATE/feature_request.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/proposal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Proposal
description: Propose an enhancement or new feature.
labels:
- proposal
body:
- type: textarea
id: usecase
attributes:
label: What motivated this proposal?
description: Describe the use case justifying this request.
validations:
required: true
- type: textarea
id: change
attributes:
label: What is the proposed change?
description: This could be a behavior change, enhanced API, or a branch new feature.
validations:
required: true
- type: textarea
id: benefits
attributes:
label: Who benefits from this change?
description: Describe how this not only benefits you.
validations:
required: false
- type: textarea
id: alternates
attributes:
label: What alternatives have you evaluated?
description: This could be using existing features or relying on an external dependency.
validations:
required: false
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ jobs:
run: |
set -eo pipefail
echo "msrv check"
rustup install 1.65.0
cargo +1.65.0 check
rustup install 1.67.0
cargo +1.67.0 check
check_examples:
name: check (examples)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ There are two clients available in two separate crates:
[![License Apache 2](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
[![Crates.io](https://img.shields.io/crates/v/async-nats.svg)](https://crates.io/crates/async-nats)
[![Documentation](https://docs.rs/async-nats/badge.svg)](https://docs.rs/async-nats/)
[![Build Status](https://github.com/nats-io/nats.rs/workflows/Rust/badge.svg)](https://github.com/nats-io/nats.rs/actions)
[![Build Status](https://github.com/nats-io/nats.rs/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/nats-io/nats.rs/actions)

New async Tokio-based NATS client.

Expand All @@ -48,7 +48,7 @@ Any feedback related to this client is welcomed.
[![License Apache 2](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
[![Crates.io](https://img.shields.io/crates/v/nats.svg)](https://crates.io/crates/nats)
[![Documentation](https://docs.rs/nats/badge.svg)](https://docs.rs/nats/)
[![Build Status](https://github.com/nats-io/nats.rs/workflows/Rust/badge.svg)](https://github.com/nats-io/nats.rs/actions)
[![Build Status](https://github.com/nats-io/nats.rs/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/nats-io/nats.rs/actions)

Legacy *synchronous* client that supports:

Expand Down
24 changes: 12 additions & 12 deletions async-nats/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "async-nats"
authors = ["Tomasz Pietrek <[email protected]>", "Casper Beyer <[email protected]>"]
version = "0.31.0"
edition = "2021"
rust = "1.64.0"
rust = "1.67.0"
description = "A async Rust NATS client"
license = "Apache-2.0"
documentation = "https://docs.rs/async-nats"
Expand All @@ -16,30 +16,30 @@ categories = ["network-programming", "api-bindings"]
[dependencies]
memchr = "2.4"
bytes = { version = "1.4.0", features = ["serde"] }
futures = { version = "0.3.26", default-features = false, features = ["std", "async-await"] }
futures = { version = "0.3.28", default-features = false, features = ["std", "async-await"] }
nkeys = "0.3.0"
once_cell = "1.17.1"
regex = "1.7.1"
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.93"
serde_repr = "0.1.10"
once_cell = "1.18.0"
regex = "1.9.1"
serde = { version = "1.0.184", features = ["derive"] }
serde_json = "1.0.104"
serde_repr = "0.1.16"
http = "0.2.9"
tokio = { version = "1.25.0", features = ["macros", "rt", "fs", "net", "sync", "time", "io-util"] }
tokio = { version = "1.29.0", features = ["macros", "rt", "fs", "net", "sync", "time", "io-util"] }
itoa = "1"
url = { version = "2"}
tokio-rustls = "0.24"
rustls-pemfile = "1.0.2"
nuid = "0.4.1"
nuid = "0.5"
serde_nanos = "0.1.3"
time = { version = "0.3.20", features = ["parsing", "formatting", "serde", "serde-well-known"] }
time = { version = "0.3.24", features = ["parsing", "formatting", "serde", "serde-well-known"] }
rustls-native-certs = "0.6"
tracing = "0.1"
thiserror = "1.0"
base64 = "0.21"
tokio-retry = "0.3"
ring = "0.16"
rand = "0.8"
webpki = { package = "rustls-webpki", version = "0.101.1", features = ["alloc", "std"] }
webpki = { package = "rustls-webpki", version = "0.101.2", features = ["alloc", "std"] }

[dev-dependencies]
criterion = { version = "0.5", features = ["async_tokio"]}
Expand All @@ -58,6 +58,6 @@ slow_tests = []


[[bench]]
name = "core_nats"
name = "main"
harness = false
lto = true
Loading

0 comments on commit 981a6b5

Please sign in to comment.