Skip to content

Commit 8602563

Browse files
committed
Merge branch 'ps/state-traits' into ps/state-impl
# Conflicts: # Cargo.lock
2 parents 5903fed + ec504d4 commit 8602563

File tree

241 files changed

+23445
-17593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+23445
-17593
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
crates/bitwarden-vault/** @bitwarden/team-vault-dev @bitwarden/team-platform-dev
1111

12+
# Temporarily owned by multiple teams
13+
/crates/bitwarden-crypto/ @bitwarden/team-platform-dev @bitwarden/dept-architecture @bitwarden/team-key-management-dev
14+
1215
# BRE for publish workflow changes
1316
.github/workflows/publish-*.yml @bitwarden/dept-bre
1417
.github/workflows/release-rust-crates.yml @bitwarden/dept-bre

.github/workflows/build-android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929

3030
- name: Install rust
31-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
31+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
3232
with:
3333
toolchain: stable
3434

@@ -71,7 +71,7 @@ jobs:
7171
fetch-depth: 0
7272

7373
- name: Install rust
74-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
74+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
7575
with:
7676
toolchain: stable
7777

.github/workflows/build-rust-crates.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636

3737
- name: Install rust
38-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
38+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
3939
with:
4040
toolchain: stable
4141

@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5858

5959
- name: Install rust
60-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
60+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
6161
with:
6262
toolchain: stable
6363

.github/workflows/build-swift.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737

3838
- name: Install rust
39-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
39+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
4040
with:
4141
toolchain: stable
4242

.github/workflows/build-wasm-internal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
working-directory: crates/bitwarden-wasm-internal/npm
6666

6767
- name: Install rust
68-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
68+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
6969
with:
7070
toolchain: "${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}"
7171
targets: wasm32-unknown-unknown

.github/workflows/check-powerset.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626

2727
- name: Install rust
28-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
28+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
2929
with:
3030
toolchain: stable
3131

.github/workflows/direct-minimal-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
echo "RUST_NIGHTLY_TOOLCHAIN=${RUST_NIGHTLY_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
4949
5050
- name: Install rust
51-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
51+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
5252
with:
5353
toolchain: "${{ steps.nightly-toolchain.outputs.RUST_NIGHTLY_TOOLCHAIN }}"
5454
targets: ${{ matrix.settings.target }}

.github/workflows/lint.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
branches: ["main"]
77
pull_request:
88

9+
permissions: {}
10+
911
env:
1012
CARGO_TERM_COLOR: always
1113

@@ -15,6 +17,10 @@ jobs:
1517

1618
runs-on: ubuntu-24.04
1719

20+
permissions:
21+
contents: read
22+
security-events: write
23+
1824
steps:
1925
- name: Checkout
2026
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -34,7 +40,7 @@ jobs:
3440
echo "RUST_NIGHTLY_TOOLCHAIN=${RUST_NIGHTLY_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
3541
3642
- name: Install rust
37-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
43+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
3844
with:
3945
toolchain: "${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}"
4046
components: clippy, rustfmt
@@ -54,7 +60,7 @@ jobs:
5460
run: cargo install clippy-sarif sarif-fmt --locked --git https://github.com/psastras/sarif-rs.git --rev 11c33a53f6ffeaed736856b86fb6b7b09fabdfd8
5561

5662
- name: Cargo clippy-sarif
57-
run: cargo clippy --all-features --tests --message-format=json |
63+
run: cargo clippy --all-features --all-targets --message-format=json |
5864
clippy-sarif | tee clippy_result.sarif | sarif-fmt
5965
env:
6066
RUSTFLAGS: "-D warnings"
@@ -70,7 +76,7 @@ jobs:
7076
# status code of the command is caught and reported as failed in GitHub.
7177
# This should be cached from the previous step and should be fast.
7278
- name: Cargo clippy
73-
run: cargo clippy --all-features --tests
79+
run: cargo clippy --all-features --all-targets
7480
env:
7581
RUSTFLAGS: "-D warnings"
7682

.github/workflows/memory-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sudo apt -y install gdb
3030
3131
- name: Install rust
32-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
32+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
3333
with:
3434
toolchain: stable
3535

.github/workflows/minimum-rust-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
echo "RUST_TOOLCHAIN=${RUST_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
3737
3838
- name: Install rust
39-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
39+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
4040
with:
4141
toolchain: "${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}"
4242
targets: ${{ matrix.settings.target }}

0 commit comments

Comments
 (0)