Skip to content

Commit

Permalink
Upgrade rust toolchain to 1.84.1 (#5211)
Browse files Browse the repository at this point in the history
* Upgrade rust toolchain to 1.84.1

* Fix lint warnings
  • Loading branch information
jtran authored Feb 6, 2025
1 parent 9008fb6 commit d3b02b8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/wasm-lib/kcl/src/execution/exec_ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,7 @@ pub struct FunctionParam<'a> {
pub ctx: ExecutorContext,
}

impl<'a> FunctionParam<'a> {
impl FunctionParam<'_> {
pub async fn call(&self, exec_state: &mut ExecState, args: Vec<Arg>) -> Result<Option<KclValue>, KclError> {
if let Some(inner) = self.inner {
inner(
Expand Down
4 changes: 2 additions & 2 deletions src/wasm-lib/kcl/src/execution/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,9 @@ impl ExecutorContext {

/// Execute an AST's program and build auxiliary outputs like the artifact
/// graph.
async fn execute_and_build_graph<'a>(
async fn execute_and_build_graph(
&self,
program: NodeRef<'a, crate::parsing::ast::types::Program>,
program: NodeRef<'_, crate::parsing::ast::types::Program>,
exec_state: &mut ExecState,
) -> Result<Option<KclValue>, KclError> {
// Don't early return! We need to build other outputs regardless of
Expand Down
8 changes: 4 additions & 4 deletions src/wasm-lib/kcl/src/std/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ async fn inner_map<'a>(
Ok(new_array)
}

async fn call_map_closure<'a>(
async fn call_map_closure(
input: KclValue,
map_fn: &FunctionParam<'a>,
map_fn: &FunctionParam<'_>,
source_range: SourceRange,
exec_state: &mut ExecState,
) -> Result<KclValue, KclError> {
Expand Down Expand Up @@ -199,10 +199,10 @@ async fn inner_reduce<'a>(
Ok(reduced)
}

async fn call_reduce_closure<'a>(
async fn call_reduce_closure(
elem: KclValue,
start: KclValue,
reduce_fn: &FunctionParam<'a>,
reduce_fn: &FunctionParam<'_>,
source_range: SourceRange,
exec_state: &mut ExecState,
) -> Result<KclValue, KclError> {
Expand Down
8 changes: 4 additions & 4 deletions src/wasm-lib/kcl/src/std/patterns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,11 @@ async fn inner_pattern_transform_2d<'a>(
execute_pattern_transform(transform, solid_set, exec_state, args).await
}

async fn execute_pattern_transform<'a, T: GeometryTrait>(
async fn execute_pattern_transform<T: GeometryTrait>(
transforms: Vec<Vec<Transform>>,
geo_set: T::Set,
exec_state: &mut ExecState,
args: &'a Args,
args: &Args,
) -> Result<Vec<T>, KclError> {
// Flush the batch for our fillets/chamfers if there are any.
// If we do not flush these, then you won't be able to pattern something with fillets.
Expand Down Expand Up @@ -414,9 +414,9 @@ async fn send_pattern_transform<T: GeometryTrait>(
Ok(geometries)
}

async fn make_transform<'a, T: GeometryTrait>(
async fn make_transform<T: GeometryTrait>(
i: u32,
transform_function: &FunctionParam<'a>,
transform_function: &FunctionParam<'_>,
source_range: SourceRange,
exec_state: &mut ExecState,
) -> Result<Vec<Transform>, KclError> {
Expand Down
2 changes: 1 addition & 1 deletion src/wasm-lib/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.83.0"
channel = "1.84.1"
components = ["clippy", "rustfmt"]

0 comments on commit d3b02b8

Please sign in to comment.