Skip to content

Commit

Permalink
Merge pull request #232 from c410-f3r/misc
Browse files Browse the repository at this point in the history
1.82 MSRV
  • Loading branch information
c410-f3r authored Sep 28, 2024
2 parents 5879ce6 + 1484bbe commit 58b2d08
Show file tree
Hide file tree
Showing 35 changed files with 526 additions and 427 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
echo `pwd`/mdbook >> $GITHUB_PATH
- name: Test and Build Book
run: |
rustup default nightly-2024-09-07
rustup default nightly-2024-09-01
cargo clean --target-dir mdbook-target
cargo build --all-features --target-dir mdbook-target
mdbook test -L mdbook-target/debug/deps wtx-docs && mdbook build wtx-docs
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: Swatinem/rust-cache@v2
- run: .scripts/autobahn-fuzzingclient.sh ci

Expand All @@ -25,7 +25,7 @@ jobs:
with:
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: Swatinem/rust-cache@v2
- run: .scripts/autobahn-fuzzingserver.sh ci

Expand All @@ -37,7 +37,7 @@ jobs:
with:
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: actions-rs/[email protected]
with:
crate: cargo-fuzz
Expand All @@ -52,7 +52,7 @@ jobs:
with:
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: Swatinem/rust-cache@v2
- run: .scripts/h2spec.sh ci

Expand All @@ -64,7 +64,7 @@ jobs:
with:
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: Swatinem/rust-cache@v2
- run: sudo apt install docker-compose -y
- run: docker-compose -f .test-utils/docker-compose.yml up -d
Expand All @@ -85,7 +85,7 @@ jobs:
components: clippy, rustfmt
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: Swatinem/rust-cache@v2
- run: .scripts/internal-tests-0.sh

Expand All @@ -102,6 +102,6 @@ jobs:
components: clippy, rustfmt
override: true
profile: minimal
toolchain: nightly-2024-09-07
toolchain: nightly-2024-09-01
- uses: Swatinem/rust-cache@v2
- run: .scripts/internal-tests-1.sh
2 changes: 1 addition & 1 deletion .scripts/internal-tests-0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
. "$(dirname "$0")/common.sh" --source-only

$rt rustfmt
$rt clippy -Aclippy::panic_in_result_fn
$rt clippy -Aclippy::little-endian-bytes,-Aclippy::panic-in-result-fn

cargo miri test -p wtx

Expand Down
2 changes: 1 addition & 1 deletion .scripts/internal-tests-1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cargo check --all-features --all-targets

# WTX Docs

rustup default nightly-2024-09-07
rustup default nightly-2024-09-01
cargo clean --target-dir mdbook-target
cargo build --all-features --target-dir mdbook-target
mdbook test -L mdbook-target/debug/deps wtx-docs
74 changes: 37 additions & 37 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![crates.io](https://img.shields.io/crates/v/wtx.svg)](https://crates.io/crates/wtx)
[![Documentation](https://docs.rs/wtx/badge.svg)](https://docs.rs/wtx)
[![License](https://img.shields.io/badge/license-APACHE2-blue.svg)](https://github.com/c410-f3r/wtx/blob/main/LICENSE)
[![Rustc](https://img.shields.io/badge/rustc-nightly-blue")](https://blog.rust-lang.org/2023/12/28/Rust-1.80.0.html)
[![Rustc](https://img.shields.io/badge/rustc-1.82-lightgray")](https://blog.rust-lang.org/2023/12/28/Rust-1.80.0.html)

A collection of different transport implementations and related tools focused primarily on web technologies. Contains the implementations of 5 IETF RFCs ([RFC6265](https://datatracker.ietf.org/doc/html/rfc6265), [RFC6455](https://datatracker.ietf.org/doc/html/rfc6455), [RFC7541](https://datatracker.ietf.org/doc/html/rfc7541), [RFC7692](https://datatracker.ietf.org/doc/html/rfc7692), [RFC9113](https://datatracker.ietf.org/doc/html/rfc9113)), 2 formal specifications ([gRPC](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md), [PostgreSQL](https://www.postgresql.org/docs/16/protocol.html)) and several other invented ideas.

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2024-09-07"
channel = "nightly-2024-09-01"
components = ["clippy", "miri", "rustfmt", "rust-src"]
profile = "minimal"
2 changes: 1 addition & 1 deletion wtx-instances/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pb-rs = { default-features = false, version = "0.10" }
argon2 = { default-features = false, version = "0.5" }
quick-protobuf = { default-features = false, version = "0.8" }
rand_chacha = { default-features = false, version = "0.3" }
rand_core = { default-features = false, feature = ["getrandom"], version = "0.6" }
rand_core = { default-features = false, features = ["getrandom"], version = "0.6" }
serde = { default-features = false, version = "1.0" }
serde_json = { default-features = false, features = ["alloc"], version = "1.0" }
tokio = { default-features = false, features = ["macros", "rt-multi-thread"], version = "1.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ use wtx::{
server_framework::{get, post, Router, ServerFrameworkBuilder, State, StateClean},
ReqResBuffer, ReqResData, SessionDecoder, SessionEnforcer, SessionTokio, StatusCode,
},
misc::Rng,
pool::{PostgresRM, SimplePoolTokio},
};

Expand Down Expand Up @@ -62,9 +61,7 @@ async fn main() -> wtx::Result<()> {
)?;
let pool = Pool::new(4, PostgresRM::tokio("postgres://USER:PASSWORD@localhost/DB_NAME".into()));
let mut rng = ChaCha20Rng::from_entropy();
let mut key = [0; 16];
rng.fill_slice(&mut key);
let (expired_sessions, session) = Session::builder(key, pool).build();
let (expired_sessions, session) = Session::builder(pool).build_generating_key(&mut rng);
tokio::spawn(async move {
if let Err(err) = expired_sessions.await {
eprintln!("{err}");
Expand Down
2 changes: 2 additions & 0 deletions wtx-macros/tests/ui.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! Ui
#[test]
fn ui() {
let t = trybuild::TestCases::new();
Expand Down
Loading

0 comments on commit 58b2d08

Please sign in to comment.