[RSDK-8992] Upgrade to rust 1.82 #354
Conversation
Also, note the espidf_time32 flag, added per rust-lang/libc#3993
There was a problem hiding this comment.
Some notes. Also, need to think about how to get this green in CI because right now it fails in anything using the docker image since they haven't been updated to 1.82, but we would need to merge this in order to build new docker images that had 1.82, so it is a bit of a chicken/egg thing.
| @@ -1,23 +1,23 @@ | |||
| [target.xtensa-esp32-espidf] | |||
| linker = "ldproxy" | |||
| runner = "espflash --monitor" | |||
| rustflags = ["-C", "default-linker-libraries", "-Clink-args=-Wl,-Map=./esp-build.map"] | |||
| rustflags = ["-C", "default-linker-libraries", "-Clink-args=-Wl,-Map=./esp-build.map", "--cfg", "espidf_time32"] | |||
There was a problem hiding this comment.
Required due to libc crate upgrade and rust-lang/libc#3993.
| @@ -39,7 +39,7 @@ debug = true # Symbols are nice and they don't increase the size on Flash | |||
| opt-level = "s" | |||
|
|
|||
| [workspace.dependencies] | |||
| anyhow = "1.0.89" | |||
| anyhow = "1.0.93" | |||
There was a problem hiding this comment.
Updates to this section per cargo upgrade with rust 1.82 enabled.
| cbindgen = "0.27.0" | ||
| chrono = "0.4.38" | ||
| chrono-tz = "0.10.0" | ||
| clap = "4.5.20" | ||
| clap = "4.5.21" |
There was a problem hiding this comment.
⬇️ - I had hoped to upgrade embedded-svc and esp-idf-svc, but did not succeed due to a puzzling error. I'll take another go at it, since I believe all that was blocking it was the rust version.
| { | ||
| println!("cargo:rustc-check-cfg=cfg(has_robot_config)"); |
There was a problem hiding this comment.
Without this, newer clippy yelled at me about cfg(has_robot_config) as an unknown config check.
| @@ -18,8 +18,10 @@ pub struct Cloud { | |||
| } | |||
|
|
|||
| fn main() { | |||
| #[cfg(not(feature = "test"))] | |||
| #[cfg(not(test))] | |||
There was a problem hiding this comment.
I think this was an error before? I'm not sure.
| @@ -1,6 +1,7 @@ | |||
| use regex::Regex; | |||
|
|
|||
| fn main() { | |||
| println!("cargo::rustc-check-cfg=cfg(esp32)"); | |||
There was a problem hiding this comment.
Like above, clippy would complain that this was an unknown config in esp32/board.rs.
| } else { | ||
| vec![] | ||
| }; | ||
| let i2c_confs = cfg |
There was a problem hiding this comment.
Newer clippy suggestion
| @@ -115,7 +115,7 @@ impl DoCommand for Coredump { | |||
| command_struct: Option<protobuf::Struct>, | |||
| ) -> Result<Option<protobuf::Struct>, crate::common::generic::GenericError> { | |||
| if let Some(cmd) = command_struct { | |||
| if cmd.fields.get("sizes").is_some() { | |||
| if cmd.fields.contains_key("sizes") { | |||
There was a problem hiding this comment.
This and ⬇️ are from newer clippy suggestions
|
I built the docker containers and validated a build within it, so I think that aspect is good to go. |
|
FYI I'm not planning to merge this until next week |
Rust 1.82 is the latest that esp-rs offers.