Fix rebase

GearsDatapacks · lpil · commit 98907f932cde · 2025-08-11T20:01:43.000+01:00
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__blocks_get_preserved_when_needed.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__blocks_get_preserved_when_needed.snap
@@ -15,7 +15,7 @@ fn make_adder(a) {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__blocks_get_preserved_when_needed2.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__blocks_get_preserved_when_needed2.snap
@@ -11,7 +11,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__do_not_inline_parameters_that_have_side_effects.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__do_not_inline_parameters_that_have_side_effects.snap
@@ -19,7 +19,7 @@ fn do_side_effects() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__do_not_inline_parameters_used_more_than_once.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__do_not_inline_parameters_used_more_than_once.snap
@@ -13,7 +13,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_anonymous_function_call.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_anonymous_function_call.snap
@@ -11,7 +11,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_anonymous_function_in_pipe.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_anonymous_function_in_pipe.snap
@@ -11,7 +11,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_capture_in_pipe.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_capture_in_pipe.snap
@@ -13,7 +13,7 @@ fn add(a, b) { a + b }
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_which_calls_other_function.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_which_calls_other_function.snap
@@ -13,7 +13,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_with_use.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_with_use.snap
@@ -14,7 +14,7 @@ pub fn divide(a, b) {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([divide/2]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_with_use_and_anonymous.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_with_use_and_anonymous.snap
@@ -14,7 +14,7 @@ pub fn divide(a, b) {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([divide/2]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_with_use_becomes_tail_recursive.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_function_with_use_becomes_tail_recursive.snap
@@ -15,7 +15,7 @@ pub fn count(from: Int, to: Int) -> Int {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([count/2]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_higher_order_function.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_higher_order_function.snap
@@ -15,7 +15,7 @@ fn double(x) { x + x }
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_higher_order_function_anonymous.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_higher_order_function_anonymous.snap
@@ -15,7 +15,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_higher_order_function_with_capture.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inline_higher_order_function_with_capture.snap
@@ -20,7 +20,7 @@ fn divide(a: Int, b: Int) -> Result(Int, Nil) {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inlining_works_through_blocks.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__inlining_works_through_blocks.snap
@@ -11,7 +11,7 @@ pub fn main() {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__parameters_from_nested_functions_are_correctly_inlined.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__inlining__parameters_from_nested_functions_are_correctly_inlined.snap
@@ -24,7 +24,7 @@ fn divide(a, b) {
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([halve_all/3]).
 
diff --git a/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__pipes__multiple_pipes.snap b/compiler-core/src/erlang/tests/snapshots/gleam_core__erlang__tests__pipes__multiple_pipes.snap
@@ -14,7 +14,7 @@ fn x(x) { x }
 
 ----- COMPILED ERLANG
 -module(my@mod).
--compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch]).
+-compile([no_auto_import, nowarn_unused_vars, nowarn_unused_function, nowarn_nomatch, inline]).
 -define(FILEPATH, "project/test/my/mod.gleam").
 -export([main/0]).
 
diff --git a/compiler-core/src/inline.rs b/compiler-core/src/inline.rs
@@ -362,8 +362,8 @@ impl Inliner<'_> {
                 location,
                 type_,
                 fun,
-                args,
-            } => self.call(location, type_, fun, args),
+                arguments,
+            } => self.call(location, type_, fun, arguments),
 
             TypedExpr::BinOp {
                 location,
@@ -472,14 +472,14 @@ impl Inliner<'_> {
                 type_,
                 record_assignment,
                 constructor,
-                args,
+                arguments,
             } => TypedExpr::RecordUpdate {
                 location,
                 type_,
                 record_assignment: record_assignment
                     .map(|assignment| Box::new(self.assignment(*assignment))),
                 constructor: self.boxed_expression(constructor),
-                args,
+                arguments,
             },
         }
     }
@@ -654,7 +654,7 @@ impl Inliner<'_> {
             },
             // Direct calls to anonymous functions can always be inlined
             TypedExpr::Fn {
-                args: parameters,
+                arguments: parameters,
                 body,
                 ..
             } => {
@@ -692,7 +692,7 @@ impl Inliner<'_> {
             location,
             type_,
             fun: Box::new(function),
-            args: arguments,
+            arguments,
         }
     }
 
@@ -1255,10 +1255,13 @@ impl FunctionToInlinable {
                 })
             }
             TypedExpr::Call {
-                fun, args, type_, ..
+                fun,
+                arguments,
+                type_,
+                ..
             } => {
                 let function = self.expression(fun)?;
-                let arguments = args
+                let arguments = arguments
                     .iter()
                     .map(|argument| {
                         Some(InlinableArgument {
@@ -1300,13 +1303,19 @@ impl FunctionToInlinable {
 
     fn type_(&self, type_: &Arc<Type>) -> InlinableType {
         match collapse_links(type_.clone()).as_ref() {
-            Type::Fn { args, return_ } => InlinableType::Function {
-                arguments: args.iter().map(|argument| self.type_(argument)).collect(),
+            Type::Fn { arguments, return_ } => InlinableType::Function {
+                arguments: arguments
+                    .iter()
+                    .map(|argument| self.type_(argument))
+                    .collect(),
                 return_: Box::new(self.type_(return_)),
             },
             Type::Named {
-                module, name, args, ..
-            } if module == PRELUDE_MODULE_NAME => self.prelude_type(name, args),
+                module,
+                name,
+                arguments,
+                ..
+            } if module == PRELUDE_MODULE_NAME => self.prelude_type(name, arguments),
             Type::Named { .. } | Type::Var { .. } | Type::Tuple { .. } => InlinableType::Other,
         }
     }
@@ -1515,7 +1524,7 @@ impl InlinableExpression {
                 location: BLANK_LOCATION,
                 type_: type_.to_type(),
                 fun: Box::new(function.to_expression()),
-                args: arguments
+                arguments: arguments
                     .iter()
                     .map(|argument| argument.to_call_arg(Self::to_expression))
                     .collect(),
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__alias_unqualified_import.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__alias_unqualified_import.snap
@@ -5,6 +5,9 @@ expression: "./cases/alias_unqualified_import"
 //// /out/lib/the_package/_gleam_artefacts/one.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one.cache_meta
 <85 byte binary>
 
@@ -26,6 +29,9 @@ id(X) ->
 //// /out/lib/the_package/_gleam_artefacts/two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/two.cache_meta
 <96 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_bug_752.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_bug_752.snap
@@ -5,6 +5,9 @@ expression: "./cases/erlang_bug_752"
 //// /out/lib/the_package/_gleam_artefacts/one.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one.cache_meta
 <65 byte binary>
 
@@ -22,6 +25,9 @@ expression: "./cases/erlang_bug_752"
 //// /out/lib/the_package/_gleam_artefacts/two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/two.cache_meta
 <92 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_escape_names.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_escape_names.snap
@@ -5,6 +5,9 @@ expression: "./cases/erlang_escape_names"
 //// /out/lib/the_package/_gleam_artefacts/one.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one.cache_meta
 <69 byte binary>
 
@@ -23,6 +26,9 @@ expression: "./cases/erlang_escape_names"
 //// /out/lib/the_package/_gleam_artefacts/two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/two.cache_meta
 <144 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_import.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_import.snap
@@ -5,6 +5,9 @@ expression: "./cases/erlang_import"
 //// /out/lib/the_package/_gleam_artefacts/one.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one.cache_meta
 <96 byte binary>
 
@@ -24,6 +27,9 @@ unbox(X) ->
 //// /out/lib/the_package/_gleam_artefacts/two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/two.cache_meta
 <65 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_import_shadowing_prelude.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_import_shadowing_prelude.snap
@@ -5,6 +5,9 @@ expression: "./cases/erlang_import_shadowing_prelude"
 //// /out/lib/the_package/_gleam_artefacts/one.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one.cache_meta
 <69 byte binary>
 
@@ -22,6 +25,9 @@ expression: "./cases/erlang_import_shadowing_prelude"
 //// /out/lib/the_package/_gleam_artefacts/two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/two.cache_meta
 <96 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_nested.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_nested.snap
@@ -5,6 +5,9 @@ expression: "./cases/erlang_nested"
 //// /out/lib/the_package/_gleam_artefacts/one@two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one@two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one@two.cache_meta
 <65 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_nested_qualified_constant.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__erlang_nested_qualified_constant.snap
@@ -5,6 +5,9 @@ expression: "./cases/erlang_nested_qualified_constant"
 //// /out/lib/the_package/_gleam_artefacts/one@two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/one@two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/one@two.cache_meta
 <65 byte binary>
 
@@ -22,6 +25,9 @@ expression: "./cases/erlang_nested_qualified_constant"
 //// /out/lib/the_package/_gleam_artefacts/two.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/two.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/two.cache_meta
 <108 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__hello_joe.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__hello_joe.snap
@@ -5,6 +5,9 @@ expression: "./cases/hello_joe"
 //// /out/lib/the_package/_gleam_artefacts/hello_joe.cache
 <.cache binary>
 
+//// /out/lib/the_package/_gleam_artefacts/hello_joe.cache_inline
+<8 byte binary>
+
 //// /out/lib/the_package/_gleam_artefacts/hello_joe.cache_meta
 <65 byte binary>
 
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__imported_constants.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__imported_constants.snap
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__imported_external_fns.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__imported_external_fns.snap
diff --git a/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__variable_or_module.snap b/test-package-compiler/src/snapshots/test_package_compiler__generated_tests__variable_or_module.snap
