Merge remote-tracking branch 'upstream/master' into documentation

Author: kenaniah

.github/workflows/cargo.yml

@@ -88,7 +88,7 @@ jobs:
         working-directory: "C:\\a\\webrtc\\webrtc"
         run: cargo test --features metrics
 
-  rustfmt_and_clippy:
+  quality:
     name: Check formatting style and run clippy
     runs-on: ubuntu-latest
     steps:
@@ -116,3 +116,5 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
+      - name: Check for typos
+        uses: crate-ci/typos@master

_typos.toml

@@ -0,0 +1,15 @@
+[type.po]
+extend-glob = ["*.csr"]
+check-file = false
+
+[default.extend-words]
+# Additionals is important for WebRTC
+additionals = "additionals"
+# STAP-A for WebRTC
+stap = "stap"
+# MIS value
+mis = "mis"
+# datas is used a lot for plural.
+datas = "datas"
+# 2nd for second
+2nd = "2nd"

constraints/Cargo.toml

@@ -16,6 +16,7 @@ rust-version = "1.63.0"
 indexmap = "1.9.1"
 serde = { version = "1.0.137", features = ["derive"], optional = true }
 ordered-float = { version = "3.0.0", default-features = false }
+thiserror = "1.0"
 
 [dev-dependencies]
 env_logger = "0.9.0"

constraints/src/algorithms/fitness_distance/value_constraint.rs

@@ -160,7 +160,7 @@ impl_numeric_value_constraint!(setting: i64, constraint: u64);
 impl_numeric_value_constraint!(setting: i64, constraint: f64);
 impl_numeric_value_constraint!(setting: f64, constraint: u64);
 
-// Specialized implementations for boolean value constraints of mis-matching
+// Specialized implementations for boolean value constraints of mismatching
 // and thus either "existence"-checked or ignored setting types:
 macro_rules! impl_exists_value_constraint {
     (settings: [$($s:ty),+], constraint: bool) => {

constraints/src/algorithms/fitness_distance/value_range_constraint.rs

@@ -142,7 +142,7 @@ impl_value_range_constraint!(setting: i64, constraint: u64);
 impl_value_range_constraint!(setting: i64, constraint: f64);
 impl_value_range_constraint!(setting: f64, constraint: u64);
 
-// Specialized implementations for non-boolean value constraints of mis-matching,
+// Specialized implementations for non-boolean value constraints of mismatching,
 // and thus ignored setting types:
 macro_rules! impl_ignored_value_range_constraint {
     (settings: [$($s:ty),+], constraint: $c:ty) => {

constraints/src/algorithms/select_settings.rs

@@ -1,5 +1,7 @@
 use std::collections::HashSet;
 
+use thiserror::Error;
+
 use crate::algorithms::fitness_distance::SettingFitnessDistanceError;
 use crate::errors::OverconstrainedError;
 use crate::{MediaTrackSettings, SanitizedMediaTrackConstraints};
@@ -24,16 +26,11 @@ pub enum DeviceInformationExposureMode {
 }
 
 /// An error type indicating a failure of the `SelectSettings` algorithm.
-#[derive(Clone, Eq, PartialEq, Debug)]
+#[derive(Error, Clone, Eq, PartialEq, Debug)]
 pub enum SelectSettingsError {
     /// An error caused by one or more over-constrained settings.
-    Overconstrained(OverconstrainedError),
-}
-
-impl From<OverconstrainedError> for SelectSettingsError {
-    fn from(error: OverconstrainedError) -> Self {
-        Self::Overconstrained(error)
-    }
+    #[error(transparent)]
+    Overconstrained(#[from] OverconstrainedError),
 }
 
 /// This function implements steps 1-5 of the `SelectSettings` algorithm
@@ -110,7 +107,7 @@ where
     // # Important
     // Instead of return just ONE settings instance "with the smallest fitness distance, as calculated in step 3"
     // we instead return ALL settings instances "with the smallest fitness distance, as calculated in step 3"
-    // and leave tie-breaking to the User Agent in a seperate step:
+    // and leave tie-breaking to the User Agent in a separate step:
     Ok(select_optimal_candidates(candidates))
 }
 

constraints/src/errors.rs

@@ -4,11 +4,13 @@
 
 use std::collections::HashMap;
 
+use thiserror::Error;
+
 use crate::algorithms::{ConstraintFailureInfo, SettingFitnessDistanceErrorKind};
 use crate::MediaTrackProperty;
 
 /// An error indicating one or more over-constrained settings.
-#[derive(Clone, Eq, PartialEq, Debug)]
+#[derive(Error, Clone, Eq, PartialEq, Debug)]
 pub struct OverconstrainedError {
     /// The offending constraint's name.
     pub constraint: MediaTrackProperty,
@@ -27,16 +29,14 @@ impl Default for OverconstrainedError {
 
 impl std::fmt::Display for OverconstrainedError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Overconstrained property {:?}", self.constraint)?;
+        write!(f, "Over-constrained property {:?}", self.constraint)?;
         if let Some(message) = self.message.as_ref() {
             write!(f, ": {message}")?;
         }
         Ok(())
     }
 }
 
-impl std::error::Error for OverconstrainedError {}
-
 impl OverconstrainedError {
     pub(super) fn exposing_device_information(
         failed_constraints: HashMap<MediaTrackProperty, ConstraintFailureInfo>,

data/CHANGELOG.md

@@ -23,7 +23,7 @@
 ## v0.5.0
 
 * [#16 [PollDataChannel] reset shutdown_fut future after done](https://github.com/webrtc-rs/data/pull/16) by [@melekes](https://github.com/melekes).
-* Increase min verison of `log` dependency to `0.4.16`. [#250 Fix log at ^0.4.16 to make tests compile](https://github.com/webrtc-rs/webrtc/pull/250) by [@k0nserv](https://github.com/k0nserv).
+* Increase min version of `log` dependency to `0.4.16`. [#250 Fix log at ^0.4.16 to make tests compile](https://github.com/webrtc-rs/webrtc/pull/250) by [@k0nserv](https://github.com/k0nserv).
 
 ## Prior to 0.4.0
 

dtls/CHANGELOG.md

@@ -18,7 +18,7 @@
 ## v0.6.0
 
 * [#254 [DTLS] Add NamedCurve::P384](https://github.com/webrtc-rs/webrtc/pull/254) contributed by [neonphog](https://github.com/neonphog)
-* Increased min verison of `log` dependency to `0.4.16`. [#250 Fix log at ^0.4.16 to make tests compile](https://github.com/webrtc-rs/webrtc/pull/250) by [@k0nserv](https://github.com/k0nserv).
+* Increased min version of `log` dependency to `0.4.16`. [#250 Fix log at ^0.4.16 to make tests compile](https://github.com/webrtc-rs/webrtc/pull/250) by [@k0nserv](https://github.com/k0nserv).
 * Increased serde's minimum version to 1.0.110 [#243 Fixes for cargo minimal-versions](https://github.com/webrtc-rs/webrtc/pull/243) contributed by [algesten](https://github.com/algesten)
 
 ## Prior to 0.6.0

dtls/Cargo.toml

@@ -31,7 +31,7 @@ aes-gcm = "0.10.1"
 ccm = "0.3.0"
 tokio = { version = "1.19", features = ["full"] }
 async-trait = "0.1.56"
-x25519-dalek = { version = "2.0.0-rc.2", features = ["static_secrets"] }
+x25519-dalek = { version = "2", features = ["static_secrets"] }
 x509-parser = "0.13.2"
 der-parser = "8.1"
 rcgen = "0.10.0"