mirror of https://github.com/fafhrd91/actix-net
Compare commits
No commits in common. "97e8c571cf034b5d441d3ceca02cfb8f785fce7b" and "779fa28bd59c87974d8effceddd59e7505dc97d5" have entirely different histories.
97e8c571cf
...
779fa28bd5
|
@ -13,8 +13,4 @@ guide/build/
|
||||||
# These are backup files generated by rustfmt
|
# These are backup files generated by rustfmt
|
||||||
**/*.rs.bk
|
**/*.rs.bk
|
||||||
|
|
||||||
# IDEs
|
|
||||||
.idea
|
.idea
|
||||||
|
|
||||||
# direnv
|
|
||||||
/.direnv
|
|
||||||
|
|
|
@ -2,10 +2,6 @@
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
## 2.5.0
|
|
||||||
|
|
||||||
- Update `mio` dependency to `1`.
|
|
||||||
|
|
||||||
## 2.4.0
|
## 2.4.0
|
||||||
|
|
||||||
- Update `tokio-uring` dependency to `0.5`.
|
- Update `tokio-uring` dependency to `0.5`.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "actix-server"
|
name = "actix-server"
|
||||||
version = "2.5.0"
|
version = "2.4.0"
|
||||||
authors = [
|
authors = [
|
||||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||||
"Rob Ede <robjtede@icloud.com>",
|
"Rob Ede <robjtede@icloud.com>",
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
<!-- prettier-ignore-start -->
|
<!-- prettier-ignore-start -->
|
||||||
|
|
||||||
[](https://crates.io/crates/actix-server)
|
[](https://crates.io/crates/actix-server)
|
||||||
[](https://docs.rs/actix-server/2.5.0)
|
[](https://docs.rs/actix-server/2.4.0)
|
||||||
[](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
|
[](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
|
||||||

|

|
||||||
<br />
|
<br />
|
||||||
[](https://deps.rs/crate/actix-server/2.5.0)
|
[](https://deps.rs/crate/actix-server/2.4.0)
|
||||||

|

|
||||||
[](https://discord.gg/NWpN5mmg3x)
|
[](https://discord.gg/NWpN5mmg3x)
|
||||||
|
|
||||||
|
|
58
flake.lock
58
flake.lock
|
@ -1,58 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"flake-parts": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715865404,
|
|
||||||
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1722651103,
|
|
||||||
"narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-24.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-lib": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714640452,
|
|
||||||
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
30
flake.nix
30
flake.nix
|
@ -1,30 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = inputs@{ flake-parts, ... }:
|
|
||||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
|
||||||
systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
|
||||||
perSystem = { pkgs, config, inputs', system, lib, ... }: {
|
|
||||||
formatter = pkgs.nixpkgs-fmt;
|
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell {
|
|
||||||
packages = [
|
|
||||||
config.formatter
|
|
||||||
pkgs.fd
|
|
||||||
pkgs.just
|
|
||||||
pkgs.nodePackages.prettier
|
|
||||||
pkgs.taplo
|
|
||||||
pkgs.watchexec
|
|
||||||
] ++ lib.optional pkgs.stdenv.isDarwin [
|
|
||||||
pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.Security
|
|
||||||
pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.CoreFoundation
|
|
||||||
pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.SystemConfiguration
|
|
||||||
pkgs.pkgsBuildHost.libiconv
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
28
justfile
28
justfile
|
@ -1,23 +1,6 @@
|
||||||
_list:
|
_list:
|
||||||
@just --list
|
@just --list
|
||||||
|
|
||||||
# Check project.
|
|
||||||
check: && clippy
|
|
||||||
just --unstable --fmt --check
|
|
||||||
# nixpkgs-fmt --check .
|
|
||||||
fd --hidden --type=file -e=md -e=yml --exec-batch prettier --check
|
|
||||||
fd --hidden -e=toml --exec-batch taplo format --check
|
|
||||||
fd --hidden -e=toml --exec-batch taplo lint
|
|
||||||
cargo +nightly fmt -- --check
|
|
||||||
|
|
||||||
# Format project.
|
|
||||||
fmt:
|
|
||||||
just --unstable --fmt
|
|
||||||
# nixpkgs-fmt .
|
|
||||||
fd --hidden --type=file -e=md -e=yml --exec-batch prettier --write
|
|
||||||
fd --type=file --hidden -e=toml --exec-batch taplo format
|
|
||||||
cargo +nightly fmt
|
|
||||||
|
|
||||||
# Downgrade dev-dependencies necessary to run MSRV checks/tests.
|
# Downgrade dev-dependencies necessary to run MSRV checks/tests.
|
||||||
[private]
|
[private]
|
||||||
downgrade-for-msrv:
|
downgrade-for-msrv:
|
||||||
|
@ -29,6 +12,7 @@ msrv := ```
|
||||||
| sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
|
| sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
|
||||||
```
|
```
|
||||||
msrv_rustup := "+" + msrv
|
msrv_rustup := "+" + msrv
|
||||||
|
|
||||||
non_linux_all_features_list := ```
|
non_linux_all_features_list := ```
|
||||||
cargo metadata --format-version=1 \
|
cargo metadata --format-version=1 \
|
||||||
| jq '.packages[] | select(.source == null) | .features | keys' \
|
| jq '.packages[] | select(.source == null) | .features | keys' \
|
||||||
|
@ -36,15 +20,19 @@ non_linux_all_features_list := ```
|
||||||
--arg exclusions "tokio-uring,io-uring" \
|
--arg exclusions "tokio-uring,io-uring" \
|
||||||
'add | unique | . - ($exclusions | split(",")) | join(",")'
|
'add | unique | . - ($exclusions | split(",")) | join(",")'
|
||||||
```
|
```
|
||||||
all_crate_features := if os() == "linux" { "--all-features" } else { "--features='" + non_linux_all_features_list + "'" }
|
|
||||||
|
all_crate_features := if os() == "linux" {
|
||||||
|
"--all-features"
|
||||||
|
} else {
|
||||||
|
"--features='" + non_linux_all_features_list + "'"
|
||||||
|
}
|
||||||
|
|
||||||
# Run Clippy over workspace.
|
# Run Clippy over workspace.
|
||||||
clippy toolchain="":
|
clippy toolchain="":
|
||||||
cargo {{ toolchain }} clippy --workspace --all-targets {{ all_crate_features }}
|
cargo {{ toolchain }} clippy --workspace --all-targets {{ all_crate_features }}
|
||||||
|
|
||||||
# Test workspace code.
|
# Test workspace code.
|
||||||
[macos]
|
[macos, windows]
|
||||||
[windows]
|
|
||||||
test toolchain="":
|
test toolchain="":
|
||||||
cargo {{ toolchain }} test --lib --tests --package=actix-macros
|
cargo {{ toolchain }} test --lib --tests --package=actix-macros
|
||||||
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros --no-default-features
|
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros --no-default-features
|
||||||
|
|
Loading…
Reference in New Issue