Apache DataFusion SQL Query Engine
chore: Update Rust toolchain to 1.95 (#22177)
Daniël Heres89391b517054
diff --git a/datafusion/catalog-listing/src/helpers.rs b/datafusion/catalog-listing/src/helpers.rsindex c6305c3000..2abe2a49a9 100644--- a/datafusion/catalog-listing/src/helpers.rs+++ b/datafusion/catalog-listing/src/helpers.rs@@ -267,14 +267,15 @@ fn populate_partition_values<'a>(match op {Operator::Eq => match (left.as_ref(), right.as_ref()) {(Expr::Column(Column { name, .. }), Expr::Literal(val, _))- | (Expr::Literal(val, _), Expr::Column(Column { name, .. })) => {+ | (Expr::Literal(val, _), Expr::Column(Column { name, .. }))if partition_values.insert(name, PartitionValue::Single(val.to_string()))- .is_some()- {- partition_values.insert(name, PartitionValue::Multi);- }+ .is_some() =>+ {+ partition_values.insert(name, PartitionValue::Multi);}+ (Expr::Column(Column { .. }), Expr::Literal(_, _))+ | (Expr::Literal(_, _), Expr::Column(Column { .. })) => {}_ => {}},Operator::And => {diff --git a/datafusion/core/src/datasource/file_format/parquet.rs b/datafusion/core/src/datasource/file_format/parquet.rsindex 6a8f7ab999..c977deab32 100644--- a/datafusion/core/src/datasource/file_format/parquet.rs+++ b/datafusion/core/src/datasource/file_format/parquet.rs@@ -68,7 +68,7 @@ pub(crate) mod test_util {// Each batch writes to their own filelet files: Vec<_> = batches.into_iter()- .zip(tmp_files.into_iter())+ .zip(tmp_files).map(|(batch, mut output)| {let mut builder = parquet::file::properties::WriterProperties::builder();if multi_page {diff --git a/datafusion/core/tests/physical_optimizer/projection_pushdown.rs b/datafusion/core/tests/physical_optimizer/projection_pushdown.rsindex 6635220cf2..6f88e01059 100644--- a/datafusion/core/tests/physical_optimizer/projection_pushdown.rs+++ b/datafusion/core/tests/physical_optimizer/projection_pushdown.rs@@ -225,7 +225,7 @@ fn test_update_matching_exprs() -> Result<()> {.iter().map(|(expr, alias)| ProjectionExpr::new(expr.clone(), alias.clone())).collect();- for (expr, expected_expr) in exprs.into_iter().zip(expected_exprs.into_iter()) {+ for (expr, expected_expr) in exprs.into_iter().zip(expected_exprs) {assert!(update_expr(&expr, &child_exprs, true)?.unwrap()@@ -366,7 +366,7 @@ fn test_update_projected_exprs() -> Result<()> {.iter().map(|(expr, alias)| ProjectionExpr::new(expr.clone(), alias.clone())).collect();- for (expr, expected_expr) in exprs.into_iter().zip(expected_exprs.into_iter()) {+ for (expr, expected_expr) in exprs.into_iter().zip(expected_exprs) {assert!(update_expr(&expr, &proj_exprs, false)?.unwrap()@@ -579,8 +579,7 @@ fn test_streaming_table_after_projection() -> Result<()> {options: SortOptions::default(),}].into(),- ]- .into_iter(),+ ],true,None,)?;diff --git a/datafusion/datasource/src/memory.rs b/datafusion/datasource/src/memory.rsindex 9f4f8aa0f3..7c9281dcc2 100644--- a/datafusion/datasource/src/memory.rs+++ b/datafusion/datasource/src/memory.rs@@ -790,7 +790,7 @@ impl DataSink for MemSink {}// write the outputs into the batches- for (target, mut batches) in self.batches.iter().zip(new_batches.into_iter()) {+ for (target, mut batches) in self.batches.iter().zip(new_batches) {// Append all the new batches in one go to minimize locking overheadtarget.write().await.append(&mut batches);}diff --git a/datafusion/datasource/src/statistics.rs b/datafusion/datasource/src/statistics.rsindex 032f4cec0b..6abfafe9d3 100644--- a/datafusion/datasource/src/statistics.rs+++ b/datafusion/datasource/src/statistics.rs@@ -261,7 +261,7 @@ impl MinMaxStatistics {/// Return a sorted list of the min statistics together with the original indicespub fn min_values_sorted(&self) -> Vec<(usize, Row<'_>)> {let mut sort: Vec<_> = self.min_by_sort_order.iter().enumerate().collect();- sort.sort_unstable_by(|(_, a), (_, b)| a.cmp(b));+ sort.sort_unstable_by_key(|(_, row)| *row);sort}diff --git a/datafusion/datasource/src/url.rs b/datafusion/datasource/src/url.rsindex 4d7f5bf14c..14f9b2af00 100644--- a/datafusion/datasource/src/url.rs+++ b/datafusion/datasource/src/url.rs@@ -258,7 +258,7 @@ impl ListingTableUrl {let full_prefix = if let Some(ref p) = prefix {let mut parts = self.prefix.parts().collect::<Vec<_>>();parts.extend(p.parts());- Path::from_iter(parts.into_iter())+ Path::from_iter(parts)} else {self.prefix.clone()};diff --git a/datafusion/execution/src/memory_pool/pool.rs b/datafusion/execution/src/memory_pool/pool.rsindex aac95b9d6a..52b601d5cd 100644--- a/datafusion/execution/src/memory_pool/pool.rs+++ b/datafusion/execution/src/memory_pool/pool.rs@@ -500,7 +500,7 @@ impl<I: MemoryPool> TrackConsumersPool<I> {)}).collect::<Vec<_>>();- consumers.sort_by(|a, b| b.1.cmp(&a.1)); // inverse ordering+ consumers.sort_by_key(|consumer| std::cmp::Reverse(consumer.1));consumers[0..std::cmp::min(top, consumers.len())].iter()diff --git a/datafusion/expr/src/window_frame.rs b/datafusion/expr/src/window_frame.rsindex 334c1fa2a0..a61d9d689a 100644--- a/datafusion/expr/src/window_frame.rs+++ b/datafusion/expr/src/window_frame.rs@@ -252,15 +252,14 @@ impl WindowFrame {// one column. However, an ORDER BY clause may be absent or have// more than one column when the start/end bounds are UNBOUNDED or// CURRENT ROW.- WindowFrameUnits::Range if self.free_range() => {+ WindowFrameUnits::Range if self.free_range() && order_by.is_empty() => {// If an ORDER BY clause is absent, it is equivalent to an// ORDER BY clause with constant value as sort key. If an// ORDER BY clause is present but has more than one column,// it is unchanged. Note that this follows PostgreSQL behavior.- if order_by.is_empty() {- order_by.push(lit(1u64).sort(true, false));- }+ order_by.push(lit(1u64).sort(true, false));}+ WindowFrameUnits::Range if self.free_range() => {}WindowFrameUnits::Range if order_by.len() != 1 => {return plan_err!("RANGE requires exactly one ORDER BY column");}diff --git a/datafusion/functions-aggregate-common/src/merge_arrays.rs b/datafusion/functions-aggregate-common/src/merge_arrays.rsindex e4eee9b2b1..43ce525d8e 100644--- a/datafusion/functions-aggregate-common/src/merge_arrays.rs+++ b/datafusion/functions-aggregate-common/src/merge_arrays.rs@@ -267,7 +267,7 @@ mod tests {&mut [lhs_orderings, rhs_orderings],&sort_options,)?;- let merged_vals = ScalarValue::iter_to_array(merged_vals.into_iter())?;+ let merged_vals = ScalarValue::iter_to_array(merged_vals)?;let merged_ts = (0..merged_ts[0].len()).map(|col_idx| {ScalarValue::iter_to_array(@@ -334,7 +334,7 @@ mod tests {&mut [lhs_orderings, rhs_orderings],&sort_options,)?;- let merged_vals = ScalarValue::iter_to_array(merged_vals.into_iter())?;+ let merged_vals = ScalarValue::iter_to_array(merged_vals)?;let merged_ts = (0..merged_ts[0].len()).map(|col_idx| {ScalarValue::iter_to_array(diff --git a/datafusion/functions-aggregate/src/average.rs b/datafusion/functions-aggregate/src/average.rsindex 24f2777797..ddeb9b0870 100644--- a/datafusion/functions-aggregate/src/average.rs+++ b/datafusion/functions-aggregate/src/average.rs@@ -877,7 +877,7 @@ where} else {let averages: Vec<T::Native> = sums.into_iter()- .zip(counts.into_iter())+ .zip(counts).map(|(sum, count)| (self.avg_fn)(sum, count)).collect::<Result<Vec<_>>>()?;PrimitiveArray::new(averages.into(), nulls) // no copydiff --git a/datafusion/functions-aggregate/src/nth_value.rs b/datafusion/functions-aggregate/src/nth_value.rsindex d131bb7a84..bddc46e27e 100644--- a/datafusion/functions-aggregate/src/nth_value.rs+++ b/datafusion/functions-aggregate/src/nth_value.rs@@ -366,7 +366,7 @@ impl NthValueAccumulator {let array = if column_values.is_empty() {new_empty_array(fields[i].data_type())} else {- ScalarValue::iter_to_array(column_values.into_iter())?+ ScalarValue::iter_to_array(column_values)?};column_wise_ordering_values.push(array);}diff --git a/datafusion/functions-window/src/nth_value.rs b/datafusion/functions-window/src/nth_value.rsindex 82e1081f75..437b4ecdb3 100644--- a/datafusion/functions-window/src/nth_value.rs+++ b/datafusion/functions-window/src/nth_value.rs@@ -569,7 +569,7 @@ mod tests {.iter().map(|range| evaluator.evaluate(&values, range)).collect::<Result<Vec<ScalarValue>>>()?;- let result = ScalarValue::iter_to_array(result.into_iter())?;+ let result = ScalarValue::iter_to_array(result)?;let result = as_int32_array(&result)?;assert_eq!(expected, *result);Ok(())diff --git a/datafusion/functions/src/core/named_struct.rs b/datafusion/functions/src/core/named_struct.rsindex 10420ba58d..71c48ce89e 100644--- a/datafusion/functions/src/core/named_struct.rs+++ b/datafusion/functions/src/core/named_struct.rs@@ -137,7 +137,7 @@ impl ScalarUDFImpl for NamedStructFunc {let return_fields = names.into_iter()- .zip(types.into_iter())+ .zip(types).map(|(name, data_type)| Ok(Field::new(name, data_type.to_owned(), true))).collect::<Result<Vec<Field>>>()?;diff --git a/datafusion/functions/src/core/planner.rs b/datafusion/functions/src/core/planner.rsindex 4d6b744b3e..22d9b5c428 100644--- a/datafusion/functions/src/core/planner.rs+++ b/datafusion/functions/src/core/planner.rs@@ -34,7 +34,7 @@ impl ExprPlanner for CoreFunctionPlanner {_schema: &DFSchema,) -> Result<PlannerResult<RawDictionaryExpr>> {let mut args = vec![];- for (k, v) in expr.keys.into_iter().zip(expr.values.into_iter()) {+ for (k, v) in expr.keys.into_iter().zip(expr.values) {args.push(k);args.push(v);}diff --git a/datafusion/optimizer/src/eliminate_outer_join.rs b/datafusion/optimizer/src/eliminate_outer_join.rsindex db21f0eb6c..cd060469b2 100644--- a/datafusion/optimizer/src/eliminate_outer_join.rs+++ b/datafusion/optimizer/src/eliminate_outer_join.rs@@ -141,16 +141,14 @@ pub fn eliminate_outer() -> JoinType {let mut new_join_type = join_type;match join_type {- JoinType::Left => {- if right_non_nullable {- new_join_type = JoinType::Inner;- }+ JoinType::Left if right_non_nullable => {+ new_join_type = JoinType::Inner;}- JoinType::Right => {- if left_non_nullable {- new_join_type = JoinType::Inner;- }+ JoinType::Left => {}+ JoinType::Right if left_non_nullable => {+ new_join_type = JoinType::Inner;}+ JoinType::Right => {}JoinType::Full => {if left_non_nullable && right_non_nullable {new_join_type = JoinType::Inner;diff --git a/datafusion/optimizer/src/push_down_filter.rs b/datafusion/optimizer/src/push_down_filter.rsindex 9c69276fa1..3564db1ebe 100644--- a/datafusion/optimizer/src/push_down_filter.rs+++ b/datafusion/optimizer/src/push_down_filter.rs@@ -1248,7 +1248,7 @@ impl OptimizerRule for PushDownFilter {let mut push_predicates = vec![];for (push, expr) in predicate_push_or_keep.into_iter()- .zip(split_conjunction_owned(filter.predicate).into_iter())+ .zip(split_conjunction_owned(filter.predicate)){if !push {keep_predicates.push(expr);diff --git a/datafusion/physical-expr/src/utils/guarantee.rs b/datafusion/physical-expr/src/utils/guarantee.rsindex add7a34f70..c36e696036 100644--- a/datafusion/physical-expr/src/utils/guarantee.rs+++ b/datafusion/physical-expr/src/utils/guarantee.rs@@ -233,7 +233,7 @@ impl LiteralGuarantee {builder = builder.aggregate_multi_conjunct(col,Guarantee::In,- literals.into_iter(),+ literals,);}diff --git a/datafusion/physical-expr/src/window/standard.rs b/datafusion/physical-expr/src/window/standard.rsindex f8d92d5de4..46f3cabbad 100644--- a/datafusion/physical-expr/src/window/standard.rs+++ b/datafusion/physical-expr/src/window/standard.rs@@ -242,7 +242,7 @@ impl WindowExpr for StandardWindowExpr {// fast path when the result only has a single rowrow_wise_results[0].to_array()?} else {- ScalarValue::iter_to_array(row_wise_results.into_iter())?+ ScalarValue::iter_to_array(row_wise_results)?};state.update(&out_col, partition_batch_state)?;diff --git a/datafusion/physical-optimizer/src/enforce_sorting/mod.rs b/datafusion/physical-optimizer/src/enforce_sorting/mod.rsindex 729a6b3121..241c843556 100644--- a/datafusion/physical-optimizer/src/enforce_sorting/mod.rs+++ b/datafusion/physical-optimizer/src/enforce_sorting/mod.rs@@ -492,7 +492,7 @@ pub fn ensure_sorting(for (idx, (required_ordering, mut child)) in plan.required_input_ordering().into_iter()- .zip(requirements.children.into_iter())+ .zip(requirements.children).enumerate(){let physical_ordering = child.plan.output_ordering();diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rsindex 2115e9a34d..92692bac43 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs@@ -509,7 +509,6 @@ impl<const STREAMING: bool> GroupValuesColumn<STREAMING> {.equal_to_group_indices.clear();- let mut group_values_len = self.group_values[0].len();for (row, &target_hash) in batch_hashes.iter().enumerate() {let entry = self.map@@ -518,7 +517,8 @@ impl<const STREAMING: bool> GroupValuesColumn<STREAMING> {let Some((_, group_index_view)) = entry else {// 1. Bucket not found case// Build `new inlined group index view`- let current_group_idx = group_values_len;+ let current_group_idx = self.group_values[0].len()+ + self.vectorized_operation_buffers.append_row_indices.len();let group_index_view =GroupIndexView::new_inlined(current_group_idx as u64);@@ -538,7 +538,6 @@ impl<const STREAMING: bool> GroupValuesColumn<STREAMING> {// Set group index to row in `groups`groups[row] = current_group_idx;- group_values_len += 1;continue;};diff --git a/datafusion/physical-plan/src/aggregates/mod.rs b/datafusion/physical-plan/src/aggregates/mod.rsindex 7cb549736c..6684622047 100644--- a/datafusion/physical-plan/src/aggregates/mod.rs+++ b/datafusion/physical-plan/src/aggregates/mod.rs@@ -413,7 +413,7 @@ impl PhysicalGroupBy {fn group_fields(&self, input_schema: &Schema) -> Result<Vec<FieldRef>> {let mut fields = Vec::with_capacity(self.num_group_exprs());for ((expr, name), group_expr_nullable) in- self.expr.iter().zip(self.exprs_nullable().into_iter())+ self.expr.iter().zip(self.exprs_nullable()){fields.push(Field::new(diff --git a/datafusion/physical-plan/src/joins/utils.rs b/datafusion/physical-plan/src/joins/utils.rsindex 90cab7246d..b4aa295562 100644--- a/datafusion/physical-plan/src/joins/utils.rs+++ b/datafusion/physical-plan/src/joins/utils.rs@@ -1451,7 +1451,7 @@ fn append_probe_indices_in_order(for (build_index, probe_index) in build_indices.values().into_iter()- .zip(probe_indices.values().into_iter())+ .zip(probe_indices.values()){// Append values between previous and current probe index with null build index:for value in prev_index..*probe_index {diff --git a/datafusion/physical-plan/src/operator_statistics/mod.rs b/datafusion/physical-plan/src/operator_statistics/mod.rsindex b577482ba4..eca017cde9 100644--- a/datafusion/physical-plan/src/operator_statistics/mod.rs+++ b/datafusion/physical-plan/src/operator_statistics/mod.rs@@ -809,11 +809,8 @@ impl StatisticsProvider for JoinStatisticsProvider {_ => return left_rows.saturating_mul(right_rows),}}- if ndv_divisor > 0 {- left_rows.saturating_mul(right_rows) / ndv_divisor- } else {- left_rows.saturating_mul(right_rows)- }+ let max_rows = left_rows.saturating_mul(right_rows);+ max_rows.checked_div(ndv_divisor).unwrap_or(max_rows)}let (inner_estimate, is_exact_cartesian, join_type) = if let Some(hash_join) =diff --git a/datafusion/spark/src/function/string/format_string.rs b/datafusion/spark/src/function/string/format_string.rsindex 84e29b4713..8eea185d36 100644--- a/datafusion/spark/src/function/string/format_string.rs+++ b/datafusion/spark/src/function/string/format_string.rs@@ -592,15 +592,15 @@ impl TryFrom<char> for TimeFormat {impl ConversionType {pub fn validate(&self, arg_type: &DataType) -> Result<()> {match self {- ConversionType::BooleanLower | ConversionType::BooleanUpper => {- if *arg_type != DataType::Boolean {- return exec_err!(- "Invalid argument type for boolean conversion: {:?}",- arg_type- );- }+ ConversionType::BooleanLower | ConversionType::BooleanUpper+ if *arg_type != DataType::Boolean =>+ {+ return exec_err!(+ "Invalid argument type for boolean conversion: {:?}",+ arg_type+ );}- ConversionType::CharLower | ConversionType::CharUpper => {+ ConversionType::CharLower | ConversionType::CharUpperif !matches!(arg_type,DataType::Int8@@ -611,23 +611,23 @@ impl ConversionType {| DataType::UInt32| DataType::Int64| DataType::UInt64- ) {- return exec_err!(- "Invalid argument type for char conversion: {:?}",- arg_type- );- }+ ) =>+ {+ return exec_err!(+ "Invalid argument type for char conversion: {:?}",+ arg_type+ );}ConversionType::DecInt| ConversionType::OctInt| ConversionType::HexIntLower- | ConversionType::HexIntUpper => {- if !arg_type.is_integer() {- return exec_err!(- "Invalid argument type for integer conversion: {:?}",- arg_type- );- }+ | ConversionType::HexIntUpper+ if !arg_type.is_integer() =>+ {+ return exec_err!(+ "Invalid argument type for integer conversion: {:?}",+ arg_type+ );}ConversionType::SciFloatLower| ConversionType::SciFloatUpper@@ -635,21 +635,21 @@ impl ConversionType {| ConversionType::CompactFloatLower| ConversionType::CompactFloatUpper| ConversionType::HexFloatLower- | ConversionType::HexFloatUpper => {- if !arg_type.is_numeric() {- return exec_err!(- "Invalid argument type for float conversion: {:?}",- arg_type- );- }+ | ConversionType::HexFloatUpper+ if !arg_type.is_numeric() =>+ {+ return exec_err!(+ "Invalid argument type for float conversion: {:?}",+ arg_type+ );}- ConversionType::TimeLower(_) | ConversionType::TimeUpper(_) => {- if !arg_type.is_temporal() {- return exec_err!(- "Invalid argument type for time conversion: {:?}",- arg_type- );- }+ ConversionType::TimeLower(_) | ConversionType::TimeUpper(_)+ if !arg_type.is_temporal() =>+ {+ return exec_err!(+ "Invalid argument type for time conversion: {:?}",+ arg_type+ );}_ => {}}diff --git a/datafusion/sql/src/parser.rs b/datafusion/sql/src/parser.rsindex 1ecf90b794..ba37a2d702 100644--- a/datafusion/sql/src/parser.rs+++ b/datafusion/sql/src/parser.rs@@ -1554,7 +1554,7 @@ mod tests {(Some(true), Some(true)),(Some(true), Some(false)),];- for (sql, (asc, nulls_first)) in sqls.iter().zip(expected.into_iter()) {+ for (sql, (asc, nulls_first)) in sqls.iter().zip(expected) {let expected = Statement::CreateExternalTable(CreateExternalTable {name: name.clone(),columns: vec![make_column_def("c1", DataType::Int(None))],diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rsindex df0e68eab6..01215ae343 100644--- a/datafusion/sql/src/planner.rs+++ b/datafusion/sql/src/planner.rs@@ -574,7 +574,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {} else {let fields = plan.schema().fields().clone();LogicalPlanBuilder::from(plan)- .project(fields.iter().zip(idents.into_iter()).map(|(field, ident)| {+ .project(fields.iter().zip(idents).map(|(field, ident)| {col(field.name()).alias(self.ident_normalizer.normalize(ident))}))?.build()diff --git a/datafusion/sql/src/unparser/plan.rs b/datafusion/sql/src/unparser/plan.rsindex 43d7ef49d9..443d7a2a85 100644--- a/datafusion/sql/src/unparser/plan.rs+++ b/datafusion/sql/src/unparser/plan.rs@@ -1449,10 +1449,10 @@ impl Unparser<'_> {fn collect_flatten_aliases(plan: &LogicalPlan, select: &mut SelectBuilder) {match plan {- LogicalPlan::SubqueryAlias(alias) => {- if Self::contains_unnest(alias.input.as_ref()) {- select.add_flatten_table_alias(alias.alias.table().to_string());- }+ LogicalPlan::SubqueryAlias(alias)+ if Self::contains_unnest(alias.input.as_ref()) =>+ {+ select.add_flatten_table_alias(alias.alias.table().to_string());}LogicalPlan::Join(join) => {Self::collect_flatten_aliases(&join.left, select);diff --git a/datafusion/sqllogictest/bin/sqllogictests.rs b/datafusion/sqllogictest/bin/sqllogictests.rsindex 8ca19025bd..69ae3a2fa7 100644--- a/datafusion/sqllogictest/bin/sqllogictests.rs+++ b/datafusion/sqllogictest/bin/sqllogictests.rs@@ -589,29 +589,16 @@ fn get_record_count(path: &PathBuf, label: String) -> u64 {let mut count: u64 = 0;records.iter().for_each(|rec| match rec {- Record::Query { conditions, .. } => {+ Record::Query { conditions, .. } | Record::Statement { conditions, .. }if conditions.is_empty()|| !conditions.contains(&Condition::SkipIf {label: label.clone(),})|| conditions.contains(&Condition::OnlyIf {label: label.clone(),- })- {- count += 1;- }- }- Record::Statement { conditions, .. } => {- if conditions.is_empty()- || !conditions.contains(&Condition::SkipIf {- label: label.clone(),- })- || conditions.contains(&Condition::OnlyIf {- label: label.clone(),- })- {- count += 1;- }+ }) =>+ {+ count += 1;}_ => {}});diff --git a/datafusion/substrait/src/logical_plan/producer/expr/literal.rs b/datafusion/substrait/src/logical_plan/producer/expr/literal.rsindex bbed7ee9be..f26984ad4a 100644--- a/datafusion/substrait/src/logical_plan/producer/expr/literal.rs+++ b/datafusion/substrait/src/logical_plan/producer/expr/literal.rs@@ -305,7 +305,7 @@ pub(crate) fn to_substrait_literal(let key_values = keys.into_iter()- .zip(values.into_iter())+ .zip(values).map(|(k, v)| {Ok(KeyValue {key: Some(k),diff --git a/docs/source/contributor-guide/development_environment.md b/docs/source/contributor-guide/development_environment.mdindex 4d04d38c74..faffa29c9c 100644--- a/docs/source/contributor-guide/development_environment.md+++ b/docs/source/contributor-guide/development_environment.md@@ -108,7 +108,7 @@ DataFusion is written in Rust and it uses a standard rust toolkit:- `rustup update stable` DataFusion generally uses the latest stable release of Rust, though it may lag when new Rust toolchains release- See which toolchain is currently pinned in the [`rust-toolchain.toml`](https://github.com/apache/datafusion/blob/main/rust-toolchain.toml) file- - This can cause issues such as not having the rust-analyzer component installed for the specified toolchain, in which case just install it manually, e.g. `rustup component add --toolchain 1.88.0 rust-analyzer`+ - This can cause issues such as not having the rust-analyzer component installed for the specified toolchain, in which case just install it manually, e.g. `rustup component add --toolchain 1.95.0 rust-analyzer`- `cargo build`- `cargo fmt` to format the code- etc.diff --git a/rust-toolchain.toml b/rust-toolchain.tomlindex c7d61a9e24..5df661d61c 100644--- a/rust-toolchain.toml+++ b/rust-toolchain.toml@@ -19,5 +19,5 @@# to compile this workspace and run CI jobs.[toolchain]-channel = "1.94.0"+channel = "1.95.0"components = ["rustfmt", "clippy"]