Skip to content

Commit

Permalink
Merge branch 'main' into async-conn-events
Browse files Browse the repository at this point in the history
  • Loading branch information
neonphog authored Jan 30, 2024
2 parents b503818 + fe9d2fa commit ea4fc6a
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ test: static tools

static: docs tools
cargo fmt -- --check
cargo clippy
cargo clippy -- -Dwarnings
(cd crates/tx5-go-pion-sys; go fmt)
(cd crates/tx5-go-pion-turn; go fmt)
@if [ "${CI}x" != "x" ]; then git diff --exit-code; fi
Expand Down
1 change: 0 additions & 1 deletion crates/tx5-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![deny(missing_docs)]
#![deny(unsafe_code)]
#![deny(warnings)]
#![doc = include_str!("README.tpl")]
//! # tx5-core
//!
Expand Down
2 changes: 1 addition & 1 deletion crates/tx5-demo/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ impl Node {

rand::seq::SliceRandom::shuffle(&mut v[..], &mut rand::thread_rng());
let big = Message::big().encode()?;
self.send(ep, v.get(0).unwrap(), big);
self.send(ep, v.first().unwrap(), big);

Ok(())
}
Expand Down
1 change: 0 additions & 1 deletion crates/tx5-go-pion-turn/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(missing_docs)]
#![deny(warnings)]
#![deny(unsafe_code)]
#![doc = tx5_core::__doc_header!()]
//! # tx5-go-pion-turn
Expand Down
3 changes: 2 additions & 1 deletion crates/tx5-go-pion/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(missing_docs)]
#![deny(warnings)]
#![doc = tx5_core::__doc_header!()]
//! # tx5-go-pion
//!
Expand All @@ -9,6 +8,8 @@
pub mod deps {
pub use libc;
pub use once_cell;
// uhhh... rust? this is a pub export...
#[allow(unused_imports)]
pub use tx5_core::deps::*;
pub use tx5_go_pion_sys;
pub use tx5_go_pion_sys::deps::*;
Expand Down
1 change: 0 additions & 1 deletion crates/tx5-online/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![deny(missing_docs)]
#![deny(unsafe_code)]
#![deny(warnings)]
#![doc = tx5_core::__doc_header!()]
//! # tx5-online
//!
Expand Down
1 change: 0 additions & 1 deletion crates/tx5-signal-srv/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(missing_docs)]
#![deny(warnings)]
#![deny(unsafe_code)]
#![doc = tx5_core::__doc_header!()]
//! # tx5-signal-srv
Expand Down
1 change: 0 additions & 1 deletion crates/tx5-signal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(missing_docs)]
#![deny(warnings)]
#![deny(unsafe_code)]
#![doc = tx5_core::__doc_header!()]
//! # tx5-signal
Expand Down
6 changes: 3 additions & 3 deletions crates/tx5/examples/turn_doctor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ async fn turn_udp_check(check: &TurnCheck) {
"CHECK_UDP",
tx5_go_pion::PeerConnectionConfig {
ice_servers: vec![tx5_go_pion::IceServer {
urls: vec![format!("turn:{}:{}", check.host, check.stun_port)],
urls: vec![format!("turn:{}:{}", check.host, check.udp_port)],
username: Some(check.user.clone()),
credential: Some(check.cred.clone()),
}],
Expand All @@ -434,7 +434,7 @@ async fn turn_tcp_plain_check(check: &TurnCheck) {
ice_servers: vec![tx5_go_pion::IceServer {
urls: vec![format!(
"turn:{}:{}?transport=tcp",
check.host, check.stun_port
check.host, check.tcp_plain_port
)],
username: Some(check.user.clone()),
credential: Some(check.cred.clone()),
Expand All @@ -451,7 +451,7 @@ async fn turn_tcp_tls_check(check: &TurnCheck) {
ice_servers: vec![tx5_go_pion::IceServer {
urls: vec![format!(
"turns:{}:{}?transport=tcp",
check.host, check.stun_port
check.host, check.tcp_tls_port
)],
username: Some(check.user.clone()),
credential: Some(check.cred.clone()),
Expand Down
3 changes: 1 addition & 2 deletions crates/tx5/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(missing_docs)]
#![deny(warnings)]
#![deny(unsafe_code)]
#![doc = tx5_core::__doc_header!()]
//! # tx5
Expand Down Expand Up @@ -203,7 +202,7 @@ impl bytes::Buf for BytesList {
}

fn chunk(&self) -> &[u8] {
match self.0.get(0) {
match self.0.front() {
Some(b) => b.chunk(),
None => &[],
}
Expand Down

0 comments on commit ea4fc6a

Please sign in to comment.