From 433d7ba2a5d958dfee7ac8b2ac8783282fec8d4a Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 25 Feb 2022 09:46:39 +0100 Subject: [PATCH 1/2] {examples,tests}/rust: cargo update This restores compatibility with current nightlies by using the latest coap-message version (after a nightly-only feature that uses saw a late change), and also removes obstacles for use with stable Rust 1.59 (in unrelated parts; the CoAP example is still nightly-only). Contributes-To: https://github.com/RIOT-OS/RIOT/issues/17526 --- examples/rust-gcoap/Cargo.lock | Bin 22631 -> 22604 bytes examples/rust-gcoap/Cargo.toml | 2 +- examples/rust-hello-world/Cargo.lock | Bin 19438 -> 19425 bytes tests/rust_minimal/Cargo.lock | Bin 19434 -> 19421 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/rust-gcoap/Cargo.lock b/examples/rust-gcoap/Cargo.lock index 246031797c8667f0224f57f481f9adaca7c337a0..6675893438d1ba56b60bfebfa99b68e38b9d0ff4 100644 GIT binary patch delta 1701 zcmXYxJ+IY85XN&Z-1ve*6uDdj+7J_jME7NOW*1`aNdzr0;fNnVXJ4iwMs1B1ogHps zVTRH&3xg^;e2pz zv-X%U`J$=QU~`n%oAp)#cM*(*!IHznW~pM%OvUZh782`{Mld%m)`os*Pju zNlWxS7O6O|lA71ywJL^=y>?r=*nVT>Dv&H{Y20d7XVv9hwL9m&-CGF=+Z?4rB`*S!_JpEF?8FZ&s8n_XS6Yo=D>ilB zM6nC}`99D*_OmPZ)63r+Tlu-Vx>=f@jEO z#aFL!;F(c(_0C^7wZAHh0oJ}+7@kuF%}E-nmOND0B39K(uL*RBYH>Y!`;tA1$?tvh5Lk(8WSV-%=FYV1Q zUcCl;{v)^EpxC>BXbmGN!8$<_sMi{uM}xGmfTjCV*s9ONQh|~_jZov`Q9r$O?Wt8l zvCR=vkE5{WQZh#$8Ri+KSnSetgj@h6$b}#+Y4fFu>#&)34Y*N4YZvA(R}QzI)8)O3 zzyQqQ6=TVR5~=1IJGbmyWaq?5XArp?=wE&`|Gv0cyFzKCjMA6|?6}1R=*BRS&%_=2 z7faFA0!uY$t zx~Oj*j`T6(8OV@>8*SdbdTG0N<@S@0199CT-w0HlAMkddj$kq0kcQnMF_x_85`_c7 zq29Zkp*&TLN`O3<9bc#4JoSITu3b(=hWHfFLUfEET-e1XqSR4_BHKb`-;i>_dkM^n zXfmzDpm?eG&U|$JJaAohI5HwdQ;Q&ggi{;ddO;*2V)_Uz_Zm5As$d@No6kI;oFov| z%d*2W+Xru5IKJa+bEE(t*^Cr+u7m-j3NxU0=*z*f-du>K0L}zg5OvKq@(3NHH(m&P zecp+$Y#-jZ@x=Uovsoh}R0hZxFkiC}TyTsmRM};Jp5S|FhQm*8cX&*6&xguADnCzdyTP zS9m3M7rPM)qDc*Aj}Qs^Te|sB;v0=b=GT(8dxS)BNSJoz3=Dr?=*h_nujG zZ7$%}l#O!2r<_z`?|BRxT=NLASBgF4VWgIv6Al(Bja)f$osXY5Hh01;TV5LXEF9@J$keM4ZLQ)x^sB` zUGAD+-1^Eqab~^iJBw$FMQhNmfw=k}f>!AvYHv831WqYx^-P0VN^HZmHb$#szJ2xW z^U9I!`OVRnPYDDj37QwHXn0o(G!CcST7)`N7eZ_edEULbxO4vC{D9Z1;!~@|h86P$ zlVb8J)rH|)tfR9f3s4K$hCq_J*6R>oy6d@n4f}MwdHj9RnfO(G1Noa61 zQ!jXNa9s+ia(9sxF(TXKX|7J(Horb~eEyo&s|va?EyiNKq|)$zj=r>NQe$YTG04Le z-8U+pqe}&`0J{Os8%~B&&F3CEG~a*V(Jk56x`3pvgpQ|0BRH?{n!UDML~H8}va>ZA zjH-mPXhFnH2Y7d7{<6EXx$xlWYiD=s6{lLWV@}-|rugKOIOjrgLd#cVD;jd|!32pz zh3_dy7~Lb-q;T%!#`yGsQ`%4!pNe8hph+YW)!B$b3|hsF(wTD51*>^+=jmC}r}MW* z)+@x~i$JvC;%KP_$M6WMa`vGXaKsACj6%yDF@_|TGUjsu>TSO_@8)#qjmwwL^$VA5 zewi=N&jTpyYR)7l^Xxl`Z?&mO(axDA@!+BhDVg9>?8)^m*cJ}LTV-strQ+{BdUW%9 zdF{}Aes{fB5^!}f3EF`2l6tGTQN&U#-B5Y8;!^EGp=w^>Nr=R;WuHqf^XJ{$Hh(>F z_&CbcgYdSVOL@)0*^Af4IfZr_LxOYxVknV15{SE9izr)P_6;Hmnc!o_@KR$&4Q<(7UO}K2lpof`UTQn yL2mUq)og?C#O|=ou)1<5z)4OkIbx-n`~qnk%>uKN45b}+RQ<2>AHML}!G8fv4fF2+ diff --git a/examples/rust-gcoap/Cargo.toml b/examples/rust-gcoap/Cargo.toml index 58d66cf76a..8ef7ff4e01 100644 --- a/examples/rust-gcoap/Cargo.toml +++ b/examples/rust-gcoap/Cargo.toml @@ -12,5 +12,5 @@ crate-type = ["staticlib"] riot-wrappers = { version = "^0.7", features = [ "with_coap_message", "with_coap_handler" ] } coap-message-demos = { git = "https://gitlab.com/chrysn/coap-message-demos/", default-features = false } -coap-handler-implementations = "0.1" +coap-handler-implementations = "0.3" riot-coap-handler-demos = { git = "https://gitlab.com/etonomy/riot-module-examples/", features = [ "vfs" ] } diff --git a/examples/rust-hello-world/Cargo.lock b/examples/rust-hello-world/Cargo.lock index e5112fbf3dcfbcdf43611088ee0e88f8a6c0c6ab..a39ed93d42a0e42c2b1b2aee95ae7dfe2b06c78b 100644 GIT binary patch delta 1366 zcmXYxv8$a$5XHGK?-3G%L@{}R5G4kyJju@P%oSARWT{ru&@0(Z9?GuAnP zv3V-q2kd?{JbCu%oox0YoPl};usPg#SY`xs=>_ZZ{O+~$!wU~r%l-SGt|xM9DR=Eq zM;~bns$|j=6^|n|s}}CA+^Z8=p)Br-1sJ+iUtoP>`Qzw#*&H99Upe~W@^W^%UE>%j zHOywSBKAft=R9zTtJjQ0)d$Z~T(S#G4CP{uvnfJoUC!RWe*Wm{(+kU$qwR(fTW%xQ zG7=Z#Nvy_8GI;c+$$M)1eZPO}>A|Wl-(7yRDI_SZVHMO# zG1ZY%1&gbtbFw%ydI{^w&;(x9TZ#uv>x0>SKkx73e-2i#oZZ@PW~vMsT4@$}G|sI; z0m51-w>acJdqvLPbCwKjBZ7bqS}d-yzMuE)&7-50gud;A?%9B;M^;ov43%bD*^8A3 zc6K6fRaMfYJd<&^ihwl{uE{ zAj00EnUjQ*K$d%Xx$5ulKD@M|<@r0?HRCKMtWBhGfx>}>iFlcHsO2V8-LQlsgLHuO znq~k5X(R=V8F#P!`0V6h+1%c)lOP$jcqvo`21&i_=6Yy@hCIVcaVn_`HyyEYQs$IJ z$Bb*2H$J|;e15MkPwsvF3Y5-SkOL`g3A0l~$GwDm10wCIjD@VBk69JQ#3@i(+!Fh= zoNVmmEnmI)+WBwkzl-7DClA61%h(eb7-gIRzr%>y&P0eQf}OQg&L~O%skQJBJ5$5J zwe2N-CLiviSf@r(tpeq^za);b?g$J&OYJ76(Y@RmMzk;k)Xc0z=-QEk#r>>jC$BGm zUc9n=@qq+;yFjeX=qQa6abjf}20kU4+q6u}qs?BJlzIRh8#pw!Ft1V|Gi4vh`RVDM z!!P8qaTSzPY&k zd$Qd`>9rcRYEh=)Ij5YsF>2JgMS%xPqV7S9L!ughvSJiEnoR>{-q$UE^y`KH0gm^L ASO5S3 delta 1345 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 CNQ6-U From 9503809f565653fa0d2e7534f2cf380052c0be4c Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 25 Feb 2022 13:11:57 +0100 Subject: [PATCH 2/2] examples/rust-gcoap: Follow renames / deprecations of riot-wrappers --- examples/rust-gcoap/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/rust-gcoap/src/lib.rs b/examples/rust-gcoap/src/lib.rs index 0059b4523c..4fdcdbba21 100644 --- a/examples/rust-gcoap/src/lib.rs +++ b/examples/rust-gcoap/src/lib.rs @@ -33,14 +33,14 @@ fn main() { println!("CoAP server ready; waiting for interfaces to settle before reporting addresses..."); - let sectimer = ztimer::ZTimer::sec(); + let sectimer = ztimer::Clock::sec(); sectimer.sleep_ticks(2); for netif in gnrc::Netif::all() { println!("Active interface from PID {:?} ({:?})", netif.pid(), netif.pid().get_name().unwrap_or("unnamed")); match netif.ipv6_addrs() { Ok(addrs) => { - for a in addrs.addresses() { + for a in &addrs { println!(" Address {:?}", a); } }