merge main, fix conflicts.

mbutrovich · mbutrovich · commit 459f09fb574d · 2025-12-09T10:17:46.000-05:00
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -19,7 +19,6 @@
 # and only MSRV is required.
 #
 # The channel is exactly same day for our MSRV.
-# Updated to 1.88 MSRV for testing with datafusion main
 [toolchain]
 channel = "nightly-2025-06-23"
 components = ["rustfmt", "clippy"]

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`# and only MSRV is required.`
`20`	`20`	`#`
`21`	`21`	`# The channel is exactly same day for our MSRV.`
`22`		`-# Updated to 1.88 MSRV for testing with datafusion main`
`23`	`22`	`[toolchain]`
`24`	`23`	`channel = "nightly-2025-06-23"`
`25`	`24`	`components = ["rustfmt", "clippy"]`