From 54ec06cd2393d4cd8b5bfc376935f08f58dbd554 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 1 Apr 2023 21:57:10 +0100 Subject: [PATCH] update bitflags to v2 --- .github/workflows/ci.yml | 2 +- .github/workflows/upload-doc.yml | 7 +++++++ actix-codec/Cargo.toml | 2 +- actix-codec/src/framed.rs | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80f3f9a1..9e0fcf11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: if: matrix.target.os == 'windows-latest' run: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append - - name: Install ${{ matrix.version }} + - name: Install Rust (${{ matrix.version }}) uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ matrix.version }} diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml index f36cb138..66147949 100644 --- a/.github/workflows/upload-doc.yml +++ b/.github/workflows/upload-doc.yml @@ -3,6 +3,13 @@ name: Upload documentation on: push: { branches: [master] } +permissions: + contents: write + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: permissions: diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml index 0aa128bb..84f964c3 100644 --- a/actix-codec/Cargo.toml +++ b/actix-codec/Cargo.toml @@ -14,7 +14,7 @@ edition = "2021" rust-version = "1.60" [dependencies] -bitflags = "1.2" +bitflags = "2" bytes = "1" futures-core = { version = "0.3.7", default-features = false } futures-sink = { version = "0.3.7", default-features = false } diff --git a/actix-codec/src/framed.rs b/actix-codec/src/framed.rs index c03ea02d..0d62a61c 100644 --- a/actix-codec/src/framed.rs +++ b/actix-codec/src/framed.rs @@ -18,6 +18,7 @@ const LW: usize = 1024; const HW: usize = 8 * 1024; bitflags! { + #[derive(Debug, Clone, Copy)] struct Flags: u8 { const EOF = 0b0001; const READABLE = 0b0010;