From 50f8ed3f726b3feb852c400fd0ad94296e628cb6 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 7 Jan 2022 12:06:53 +0100 Subject: [PATCH 1/2] {examples,tests}/rust*: Update Cargo.toml This pulls in adjustments to the C-nonbreaking but Rust-breaking API change in https://github.com/RIOT-OS/RIOT/pull/17359 cstr_core is forcibly kept at 0.2.4 because 0.2.5 needs a newer nightly than riotdocker currently has. --- examples/rust-gcoap/Cargo.lock | Bin 22635 -> 22657 bytes examples/rust-hello-world/Cargo.lock | Bin 19452 -> 19474 bytes tests/rust_minimal/Cargo.lock | Bin 19448 -> 19470 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/rust-gcoap/Cargo.lock b/examples/rust-gcoap/Cargo.lock index 024687b93624eee957954e80972792fa30afad4c..dfb88c60b2b1b6cb8cc3ca8a24bc36b10252d7f8 100644 GIT binary patch delta 903 zcmXYwv98rc5XN&<``q;M;^U>L0) zT%eD^q1pq=0G;S#@xtcD%R86t>D7;pH_!k2aMxZZGof0XRcTGL5ooD73NcOSreb}< zqOn{kb!KK7O=aK`${(el^tLAt&$eHvzAd)O7z(wDMNM}U6b1ki;BtDlOys0#6fEdH z3^N7OGK6&WlsrE^t3SP)5&!w%@tq(x;nbtln-m>D22JhjyYMv#? zFfKG)X+RbBJVQ~tW=H9;{eSn;@#ftt@0SSzb%ef+*rj9v~o2;b4J2?Q_Sh+?Gz#uy?(qKy delta 884 zcmXYwv98ud5XJMM1cLDrL%3k#EzC{q46`#kyEDeXrx+SZyf@(mc4l^C2ZV%*hRWLf zJ6}R>zIU*n|a6V$ayJyb)&e^wDyMNy8-u-=VN89C37mtQ((YY$tT6MZONN{0R z@L4z%8#?&l1u@vb70T3J23Z#}I*j|Lw|26`VWns)*$)>Jjo+F;T4^5pK}tMk8Zr?sQrGU|b`QYr-}3oeu;+`!W>FGe$LJxAio zQ(~DTjJYc4fF85$CWjfDlR%r~N)uIOj6$fYqr?8vRRKw1#)G9L~SqL?e zQMLrP{UKNXv!gN*{P+~eszrrbxiYB1C|DSWkTwDpoVoeXR#>#5*33-EKg#`k_Sv?- zbK~&kch7HbA3nc$WOYQ-SQa!ZQ`1724C-vXieohPJOn5MtvC`!LHYOy(z0(aPEHTs zKE8eJD7Lp=AYFK!5NowT*^`pVnKJeqq&{?V(3n-bHCi#Gwd@yjMiZC>pKdRHyuO`1 zIhOC3u(<_fC(IiYnfCf|G1+ujB>_yhIQaK+CVOwjUncKfJm;x$z&VzWZzd diff --git a/examples/rust-hello-world/Cargo.lock b/examples/rust-hello-world/Cargo.lock index 353d9fbe439664f5514a0a027d5eb3325b925f8c..534b1224a4af74ee6afb4fe2f0fba6003e4bf98b 100644 GIT binary patch delta 891 zcmXw&&#E0n48}R4Qf?J#r568eq%M>SW+szKqJn4Bg)6U*kV!HHp)cUholEUm=)#8( z&l89g-1-dq06u_-xu>|9VPN>aFUc?e{BU^sAi9O`t4`09p**P8AlHi!M)rqo0q0_BwU~_?7Cp1 z?O-gORmp4$TicBFqw7t+(_ariy%amxOkfQ59Oc`%F#!NFP``Q3$`UALk;E-Dy_G-V z_6Fq@mtvoN`0t^@{r%v}V0#+DOa)-W6_Ju|Fr#%^C>LUD;L mYczQm0HGKF&287_OaRX;rZSABwxPg1ee>S^^Pi92eEC20908vI delta 885 zcmXX_zpC9u5axhJi6MFg&R*&bZJyH_tGq|1a}fny0; zQwGu5D6mVOqFR^0?5*ZZfW?}sCR!V;3(PMMzg>I!>Gnj=_sggU#!8@sn=H6cmT&`4 z*1Q(U)RslS|vknnAo&R zskWwfn+2hz78*W*k6=H4cXj)dPY*A@dA{56_SxCJJs3=x&a;|T8Utvx=)pk60b0Q+ z>}E98uyZT5%8W=ygqp}GN8De&{rA0tR3?I7tO8lJs8B0c1~nK33*!*dMxcT-9T?gQ zi#F7n2@3fU?(tVw4*$WckGB7>pYN@XXd26cW@Tzx2-Al;Td(36jXfU$%0MfQgi%nA zOOSN^9l_uA&O5MPAQ^a_5NowT*_e{qnKJe~q&{?V(3n-bHCi#GwQL%5#uND7#rxY| zmy?-WK=#4BF_C#s8(U-mQE^#^RZI&KryGLoZXHW8){wEfuVW;KpT58T!FFU6BgW}P_sEsm%M@%ve)(d8b8~d9d9;tCQAX3X<)Z&gN o;j4!OriE+Hu4$KKV|yhxP~atkn6g`bjWxHw&rT1o@0?zG3(NHYhyVZp diff --git a/tests/rust_minimal/Cargo.lock b/tests/rust_minimal/Cargo.lock index 10e357c08665062571bc8569eafb75a0b11e551a..516df96c6fbadace4a8d6c2b0fb8c8bb6874bab2 100644 GIT binary patch delta 895 zcmXYwv8tX$5Qh21XgEg2BQb{DFU{ZsnUy}rH$a6FKKpJSf2NtnRotua`^tI!!N(TxBcEt85BIowDy=< z47yrFbE=`jHi(0I4Umd14Mb$lwt|e?*!1I@r^n}CUq8t9#>0W}=0 zuA&A@0$UMP3}%VawD7F13s)U(xLmL$?}O8~cb>g_7(34hdUIrkHO(}tB~u$9%p%5Q zGRp#8PLQ0L&U7$oT?F}~$(6tD??>0SzwY-6U*&kt$zpL<^(1JDSQ3(1`jQVJquB_Ia`oN+=5es+jH=q9cT5T^I=}oh2t~Ps{*4@$#GaJ2@ZZd(97Yr4l>(PNLP%}3m${#q(5YHM0 zjNO86U;@ENtb49;cYXD}>c=Oie||ar`upq0AN}?Qmuu799eeMZE)Ejhm=!!5hvGm7 zU%Vj}8@NJCoo$g#A){lx|K{;EzHg94}2 zD(Za;J1X%1;HPJp`-(g;zzkm1XYsXIyZXa!<85p~O3NBf2qio>;UaWaDn&FtW z5O=*2ORg~HuAm#{vH0rv>*1#-xNsw}(&(cEVbWmE;#GuAx{OYSJg~rNx7KZ^Ps@fd zN(?Pe;5)tNryu-#dX7KD3nCb#q;qz&PHO?}5i=O5IlyR`!fr;XhLcC@T{5D~5E>$@ zT^#)8qu>5Fk6I%5-6)WCiw?bWXHbLHurV$n9RwEILqog(u_}xF_$tdj1oh zy>vXgzP+)&VrXm&%FZ;j5taiz$L!)5gS{RB+CpoNgwaqgLr`@6p5S--_#SLFC1%MC$xw~4J8YslKu_k9>&escZ%=@P{wiB&bJI$4#YtZOu_{!8^|JFJ|j z=1`N+JSG^8)iQWRl4x_tyFE$8W#*AFQ|k0{{R3 From 70726d46ab2a43003f169365bb1b5989d64095ea Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 7 Jan 2022 14:23:09 +0100 Subject: [PATCH 2/2] {examples,tests}/rust*: Blacklist ek-lm4f120xl board Something in C2Rust mistranspiles around LED_PORT; disabling the board for all Rust examples/tests. --- examples/rust-gcoap/Makefile | 4 ++++ examples/rust-hello-world/Makefile | 4 ++++ tests/rust_minimal/Makefile | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/examples/rust-gcoap/Makefile b/examples/rust-gcoap/Makefile index 1cdf7b43c1..eb59d94b5e 100644 --- a/examples/rust-gcoap/Makefile +++ b/examples/rust-gcoap/Makefile @@ -36,4 +36,8 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module FEATURES_REQUIRED += rust_target +# Currently unknown, something related to the LED_PORT definition that doesn't +# pass C2Rust's transpilation +BOARD_BLACKLIST := ek-lm4f120xl + include $(RIOTBASE)/Makefile.include diff --git a/examples/rust-hello-world/Makefile b/examples/rust-hello-world/Makefile index c411d26d26..b6d08353e4 100644 --- a/examples/rust-hello-world/Makefile +++ b/examples/rust-hello-world/Makefile @@ -21,4 +21,8 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module FEATURES_REQUIRED += rust_target +# Currently unknown, something related to the LED_PORT definition that doesn't +# pass C2Rust's transpilation +BOARD_BLACKLIST := ek-lm4f120xl + include $(RIOTBASE)/Makefile.include diff --git a/tests/rust_minimal/Makefile b/tests/rust_minimal/Makefile index 37ef882eee..9001f83c6c 100644 --- a/tests/rust_minimal/Makefile +++ b/tests/rust_minimal/Makefile @@ -5,4 +5,8 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module FEATURES_REQUIRED += rust_target +# Currently unknown, something related to the LED_PORT definition that doesn't +# pass C2Rust's transpilation +BOARD_BLACKLIST := ek-lm4f120xl + include $(RIOTBASE)/Makefile.include