fixup! feat: improve URI handling by basing it on the libcoap type.

namib-project · Jul 16, 2024 · 9ea40af · 9ea40af
1 parent 332add2
commit 9ea40af
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,23 +24,23 @@ jobs:
  - uses: actions/checkout@v3
  with:
  submodules: true
- - uses: dtolnay/rust-toolchain@master
+ - uses: dtolnay/rust-toolchain@stable
  with:
  components: rust-src
- toolchain: nightly
+ toolchain: stable
  - if: matrix.dtls_backend == 'gnutls'
  uses: awalsh128/cache-apt-pkgs-action@latest
  with:
  packages: libgnutls28-dev libgnutls30
  version: 1.0
  - if: matrix.crate == 'libcoap-rs' && matrix.dtls_backend != 'gnutls'
- run: cargo test -p ${{ matrix.crate }} --no-default-features --features dtls,tcp,vendored --features dtls_${{ matrix.dtls_backend }} --features dtls_${{ matrix.dtls_backend }}_vendored --no-fail-fast -- -Z unstable-options --report-time --ensure-time
+ run: cargo test -p ${{ matrix.crate }} --no-default-features --features dtls,tcp,vendored --features dtls_${{ matrix.dtls_backend }} --features dtls_${{ matrix.dtls_backend }}_vendored --no-fail-fast
  - if: matrix.crate == 'libcoap-rs' && matrix.dtls_backend == 'gnutls'
- run: cargo test -p ${{ matrix.crate }} --no-default-features --features dtls,tcp,vendored --features dtls_${{ matrix.dtls_backend }} --no-fail-fast -- -Z unstable-options --report-time --ensure-time
+ run: cargo test -p ${{ matrix.crate }} --no-default-features --features dtls,tcp,vendored --features dtls_${{ matrix.dtls_backend }} --no-fail-fast
  - if: matrix.crate == 'libcoap-sys' && matrix.dtls_backend != 'gnutls'
- run: cargo test -p ${{ matrix.crate }} --features dtls,dtls_backend_${{ matrix.dtls_backend }},dtls_backend_${{ matrix.dtls_backend }}_vendored --no-fail-fast -- -Z unstable-options --report-time --ensure-time
+ run: cargo test -p ${{ matrix.crate }} --features dtls,dtls_backend_${{ matrix.dtls_backend }},dtls_backend_${{ matrix.dtls_backend }}_vendored --no-fail-fast
  - if: matrix.crate == 'libcoap-sys' && matrix.dtls_backend == 'gnutls'
- run: cargo test -p ${{ matrix.crate }} --features dtls,dtls_backend_${{ matrix.dtls_backend }} --no-fail-fast -- -Z unstable-options --report-time --ensure-time
+ run: cargo test -p ${{ matrix.crate }} --features dtls,dtls_backend_${{ matrix.dtls_backend }} --no-fail-fast
 
  lint:
  runs-on: ubuntu-latest

diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
diff --git a/libcoap/src/message/request.rs b/libcoap/src/message/request.rs
@@ -7,7 +7,6 @@
  * See the README as well as the LICENSE file for more information.
  */
 
-use std::fmt::Display;
 use std::str::FromStr;
 
 use crate::{
@@ -207,7 +206,7 @@ impl CoapRequest {
  /// Returns a [MessageConversionError] if the provided PDU cannot be parsed into a request.
  pub fn from_message<'a>(
  mut pdu: CoapMessage,
- session: &(impl CoapSessionCommon<'a>),
+ session: &impl CoapSessionCommon<'a>,
  ) -> Result<CoapRequest, MessageConversionError> {
  let mut host = None;
  let mut port = None;

diff --git a/libcoap/src/message/response.rs b/libcoap/src/message/response.rs
@@ -7,7 +7,6 @@
  * See the README as well as the LICENSE file for more information.
  */
 
-use std::fmt::Display;
 
 use crate::error::{MessageConversionError, MessageTypeError, OptionValueError};
 use crate::message::{CoapMessage, CoapMessageCommon, CoapOption};

diff --git a/libcoap/tests/common/mod.rs b/libcoap/tests/common/mod.rs
@@ -100,9 +100,8 @@ pub(crate) fn run_test_server<F: FnOnce(&mut CoapContext)>(context_configurator:
  context.shutdown(Some(Duration::from_secs(0))).unwrap();
 }
 
-pub(crate) fn gen_test_request(server_address: SocketAddr) -> CoapRequest {
+pub(crate) fn gen_test_request() -> CoapRequest {
  let uri = "/test1".parse().expect("unable to parse request URI");
 
- let mut request = CoapRequest::new(CoapMessageType::Con, CoapRequestCode::Get, uri).unwrap();
- request
+ CoapRequest::new(CoapMessageType::Con, CoapRequestCode::Get, uri).unwrap()
 }
diff --git a/libcoap/tests/dtls_client_server_test.rs b/libcoap/tests/dtls_client_server_test.rs
@@ -72,7 +72,7 @@ pub fn dtls_client_server_request() {
  let mut context = CoapContext::new().unwrap();
  let session = CoapClientSession::connect_dtls(&mut context, server_address, DummyCryptoProvider {}).unwrap();
 
- let request = common::gen_test_request(server_address);
+ let request = common::gen_test_request();
  let req_handle = session.send_request(request).unwrap();
  loop {
  assert!(context.do_io(Some(Duration::from_secs(10))).expect("error during IO") <= Duration::from_secs(10));

diff --git a/libcoap/tests/tcp_client_server_test.rs b/libcoap/tests/tcp_client_server_test.rs
@@ -28,7 +28,7 @@ pub fn basic_client_server_request() {
  let mut context = CoapContext::new().unwrap();
  let session = CoapClientSession::connect_tcp(&mut context, server_address).unwrap();
 
- let request = common::gen_test_request(server_address);
+ let request = common::gen_test_request();
  let req_handle = session.send_request(request).unwrap();
  loop {
  assert!(context.do_io(Some(Duration::from_secs(10))).expect("error during IO") <= Duration::from_secs(10));

diff --git a/libcoap/tests/udp_client_server_test.rs b/libcoap/tests/udp_client_server_test.rs
@@ -27,7 +27,7 @@ pub fn basic_client_server_request() {
  let mut context = CoapContext::new().unwrap();
  let session = CoapClientSession::connect_udp(&mut context, server_address).unwrap();
 
- let request = common::gen_test_request(server_address);
+ let request = common::gen_test_request();
  let req_handle = session.send_request(request).unwrap();
  loop {
  assert!(context.do_io(Some(Duration::from_secs(10))).expect("error during IO") <= Duration::from_secs(10));