Merge remote-tracking branch 'rustcrypto/master' into green-tests

Author: pinkforest

.github/workflows/ci.yml

@@ -10,6 +10,11 @@ env:
   RUSTFLAGS: "-Dwarnings"
   RUSTDOCFLAGS: "-Dwarnings"
 
+# Cancels CI jobs when new commits are pushed to a PR branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/workspace.yml

@@ -9,6 +9,11 @@ on:
     paths-ignore:
       - README.md
 
+# Cancels CI jobs when new commits are pushed to a PR branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   clippy:
     runs-on: ubuntu-latest
@@ -44,4 +49,10 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - env:
           RUSTDOCFLAGS: "-Dwarnings --cfg docsrs"
-        run: cargo doc --no-deps --features std,pem,serde,hazmat,sha2
+        run: cargo doc --no-deps --features std,serde,hazmat,sha2
+
+  typos:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: crate-ci/[email protected]

.typos.toml

@@ -0,0 +1,3 @@
+[default.extend-identifiers]
+# typ stands for type, but it's a reserved identifier
+typ = "typ"

CHANGELOG.md

@@ -95,7 +95,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 - "Unsalted" PSS support ([#294])
-- `EncryptionPrimitive`/`DecriptionPrimitive` traits ([#300])
+- `EncryptionPrimitive`/`DescriptionPrimitive` traits ([#300])
 - `PublicKey`/`PrivateKey` traits ([#300])
 - `Zeroize` impl on `RsaPrivateKey`; automatically zeroized on drop ([#311])
 - `Deref<Target=RsaPublicKey>` impl on `RsaPrivateKey`; use `AsRef` instead ([#317])