update dependency versions and toolchain

Author: muwo-barenhoff

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 0.5.0 -- unreleased
 
-- Rust 1.58 is now required.
+- Rust 1.63 is now required.
 - Fixed-length string types in `ads::strings` are now using const generics
   instead of macro-created types.
 - Array bounds can be negative, change type in symbol info (#13).

Cargo.toml

@@ -9,17 +9,17 @@ repository = "https://github.com/birkenfeld/ads-rs"
 keywords = ["Beckhoff", "ADS", "automation", "device", "PLC"]
 
 [dependencies]
-byteorder = "1.4.3"
-crossbeam-channel = "0.5.1"
-itertools = "0.10.1"
-thiserror = "1.0.39"
-zerocopy = "0.6.1"
+byteorder = "1.5.0"
+crossbeam-channel = "0.5.13"
+itertools = "0.13.0"
+thiserror = "1.0.63"
+zerocopy = { version = "0.7.35", features = ["derive"] }
 
 [dev-dependencies]
-once_cell = "1.14.0"
+once_cell = "1.19.0"
 parse_int = "0.6.0"
-quick-xml = "0.23.0"
-regex = "1.5.4"
-structopt = "0.3.25"
-strum = { version = "0.24", features = ["derive"] }
-time = { version = "<0.3.14", features = ["formatting"] }
+quick-xml = "0.36.1"
+regex = "<1.10.0"
+structopt = "0.3.26"
+strum = { version = "0.26.3", features = ["derive"] }
+time = { version = "<0.3.21", features = ["formatting"] }

README.md

@@ -18,7 +18,7 @@ ads = "0.4"
 
 ### Rust version
 
-Minimum supported Rust version is 1.58.1.
+Minimum supported Rust version is 1.63.0.
 
 ## Usage
 

examples/adstool.rs

@@ -9,7 +9,7 @@ use itertools::Itertools;
 use parse_int::parse;
 use structopt::{clap::AppSettings, clap::ArgGroup, StructOpt};
 use strum::EnumString;
-use quick_xml::events::Event;
+use quick_xml::{events::Event, name::QName};
 use time::OffsetDateTime;
 
 #[derive(StructOpt, Debug)]
@@ -418,17 +418,16 @@ fn main_inner(args: Args) -> Result<(), Error> {
             let mut xml = [0; 2048];
             dev.read(ads::index::TARGET_DESC, 1, &mut xml)?;
             let mut rdr = quick_xml::Reader::from_reader(&xml[..]);
-            rdr.trim_text(true);
-            let mut buf = Vec::new();
+            rdr.config_mut().trim_text(true);
             let mut stack = Vec::new();
             loop {
-                match rdr.read_event(&mut buf) {
-                    Ok(Event::Start(el)) => if el.name() != b"TcTargetDesc" {
-                        stack.push(String::from_utf8_lossy(el.name()).to_string());
+                match rdr.read_event() {
+                    Ok(Event::Start(el)) => if el.name() != QName(b"TcTargetDesc") {
+                        stack.push(String::from_utf8_lossy(el.name().0).to_string());
                     }
                     Ok(Event::End(_)) => { let _ = stack.pop(); }
                     Ok(Event::Text(t)) => if !stack.is_empty() {
-                        println!("{}: {}", stack.iter().format("."), String::from_utf8_lossy(t.escaped()));
+                        println!("{}: {}", stack.iter().format("."), String::from_utf8_lossy(&t));
                     }
                     Ok(Event::Eof) => break,
                     Err(e) => return Err(Error::Str(format!("error parsing target desc XML: {}", e))),

rust-toolchain

@@ -1 +1 @@
-1.58.1
+1.63.0

src/client.rs

@@ -18,7 +18,7 @@ use crate::notif;
 use crate::{AmsAddr, AmsNetId, Error, Result};
 
 use zerocopy::byteorder::{U16, U32};
-use zerocopy::{AsBytes, FromBytes};
+use zerocopy::{AsBytes, FromBytes, FromZeroes};
 
 /// An ADS protocol command.
 // https://infosys.beckhoff.com/content/1033/tc3_ads_intro/115847307.html?id=7738940192708835096
@@ -979,7 +979,7 @@ impl FromStr for AdsState {
 // Structures used in communication, not exposed to user,
 // but pub(crate) for the test suite.
 
-#[derive(AsBytes, FromBytes, Debug)]
+#[derive(AsBytes, FromBytes, FromZeroes, Debug)]
 #[repr(C)]
 pub(crate) struct AdsHeader {
     /// 0x0 - ADS command
@@ -1009,7 +1009,7 @@ pub(crate) struct AdsHeader {
     pub invoke_id:   U32<LE>,
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct DeviceInfoRaw {
     pub major:   u8,
@@ -1018,22 +1018,22 @@ pub(crate) struct DeviceInfoRaw {
     pub name:    [u8; 16],
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct IndexLength {
     pub index_group:  U32<LE>,
     pub index_offset: U32<LE>,
     pub length:       U32<LE>,
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct ResultLength {
     pub result:       U32<LE>,
     pub length:       U32<LE>,
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct IndexLengthRW {
     pub index_group:  U32<LE>,
@@ -1042,22 +1042,22 @@ pub(crate) struct IndexLengthRW {
     pub write_length: U32<LE>,
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct ReadState {
     pub ads_state:   U16<LE>,
     pub dev_state:   U16<LE>,
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct WriteControl {
     pub ads_state:   U16<LE>,
     pub dev_state:   U16<LE>,
     pub data_length: U32<LE>,
 }
 
-#[derive(FromBytes, AsBytes)]
+#[derive(FromBytes, FromZeroes, AsBytes)]
 #[repr(C)]
 pub(crate) struct AddNotif {
     pub index_group:  U32<LE>,

src/netid.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 
 use byteorder::{ReadBytesExt, WriteBytesExt, LE};
 use itertools::Itertools;
-use zerocopy::{AsBytes, FromBytes};
+use zerocopy::{AsBytes, FromBytes, FromZeroes};
 
 /// Represents an AMS NetID.
 ///
@@ -19,7 +19,8 @@ use zerocopy::{AsBytes, FromBytes};
 /// Although often the first 4 bytes of a NetID look like an IP address, and
 /// sometimes even are identical to the device's IP address, there is no
 /// requirement for this, and one should never rely on it.
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default, Debug, AsBytes, FromBytes)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default, Debug,
+         AsBytes, FromZeroes, FromBytes)]
 #[repr(C)]
 pub struct AmsNetId(pub [u8; 6]);
 

src/strings.rs

@@ -24,6 +24,11 @@ impl<const LEN: usize> String<LEN> {
         self.0.iter().position(|&b| b == 0).unwrap_or(self.0.len())
     }
 
+    /// Returns true if the string is empty.
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
     /// Get the slice up to the first null byte.
     pub fn as_bytes(&self) -> &[u8] {
         &self.0[..self.len()]
@@ -123,10 +128,13 @@ unsafe impl<const LEN: usize> zerocopy::AsBytes for String<LEN> {
     fn only_derive_is_allowed_to_implement_this_trait() { }
 }
 
-unsafe impl<const LEN: usize> zerocopy::FromBytes for String<LEN> {
+unsafe impl<const LEN: usize> zerocopy::FromZeroes for String<LEN> {
     fn only_derive_is_allowed_to_implement_this_trait() { }
 }
 
+unsafe impl<const LEN: usize> zerocopy::FromBytes for String<LEN> {
+    fn only_derive_is_allowed_to_implement_this_trait() { }
+}
 
 /// Represents a fixed-length wide string.
 ///
@@ -154,6 +162,11 @@ impl<const LEN: usize> WString<LEN> {
         self.0.iter().position(|&b| b == 0).unwrap_or(self.0.len())
     }
 
+    /// Returns true if the string is empty.
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
     /// Get the slice up to the first null code unit.
     pub fn as_slice(&self) -> &[u16] {
         &self.0[..self.len()]
@@ -262,10 +275,13 @@ unsafe impl<const LEN: usize> zerocopy::AsBytes for WString<LEN> {
     fn only_derive_is_allowed_to_implement_this_trait() { }
 }
 
-unsafe impl<const LEN: usize> zerocopy::FromBytes for WString<LEN> {
+unsafe impl<const LEN: usize> zerocopy::FromZeroes for WString<LEN> {
     fn only_derive_is_allowed_to_implement_this_trait() { }
 }
 
+unsafe impl<const LEN: usize> zerocopy::FromBytes for WString<LEN> {
+    fn only_derive_is_allowed_to_implement_this_trait() { }
+}
 
 // compatibility aliases
 

src/test/mod.rs

@@ -12,7 +12,7 @@ use byteorder::{ByteOrder, ReadBytesExt, WriteBytesExt, LE};
 use once_cell::sync::Lazy;
 use zerocopy::{
     byteorder::{U32, U64},
-    AsBytes, FromBytes,
+    AsBytes, FromBytes, FromZeroes,
 };
 
 use crate::client::{AddNotif, AdsHeader, IndexLength, IndexLengthRW};
@@ -448,7 +448,7 @@ impl Server {
     }
 }
 
-#[derive(AsBytes, FromBytes, Debug, Default)]
+#[derive(AsBytes, FromBytes, FromZeroes, Debug, Default)]
 #[repr(C)]
 struct SingleNotification {
     len:     U32<LE>,

src/udp.rs

@@ -7,7 +7,7 @@ use std::{char, iter, str};
 
 use byteorder::{ByteOrder, ReadBytesExt, WriteBytesExt, LE};
 use zerocopy::byteorder::{U16, U32};
-use zerocopy::{AsBytes, FromBytes};
+use zerocopy::{AsBytes, FromBytes, FromZeroes};
 
 use crate::errors::ErrContext;
 use crate::{AmsAddr, AmsNetId, Error, Result};
@@ -295,7 +295,7 @@ pub fn get_info(target: (&str, u16)) -> Result<SysInfo> {
     })
 }
 
-#[derive(FromBytes, AsBytes, Default)]
+#[derive(FromBytes, FromZeroes, AsBytes, Default)]
 #[repr(C)]
 pub(crate) struct UdpHeader {
     magic:     U32<LE>,