Merge branch 'main' into fix-parser-error

candy-lang · Feb 22, 2024 · b0b98e9 · b0b98e9 · jwbot · Feb 22, 2024
2 parents 07d45cd + 7f99bf4
commit b0b98e9
Show file tree

Hide file tree

Showing 71 changed files with 699 additions and 517 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -39,6 +39,10 @@
   - changed-files:
       - any-glob-to-any-file:
           - vscode_extension/**/*
+'P: ComplexNumber':
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/ComplexNumber/**/*
 'P: Core':
   - changed-files:
       - any-glob-to-any-file:

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -19,7 +19,7 @@ jobs:
           repo-token: ${{ secrets.BOT_TOKEN }}
 
   assign-author:
-    if: github.event.action == 'opened'
+    if: github.event.action == 'opened' && github.event.pull_request.user.login != 'dependabot[bot]'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -28,7 +28,7 @@ jobs:
 
   automerge-pr:
     if: >
-      github.base_ref == 'refs/heads/main'
+      github.base_ref == 'main'
       && (
         (github.event.action == 'opened' && !github.event.pull_request.draft)
         || github.event.action == 'ready_for_review')

diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,10 @@ members = [
     "compiler/vm/fuzz",
 ]
 
+[workspace.package]
+edition = "2021"
+rust-version = "1.78.0"
+
 [profile.release]
 # https://github.com/flamegraph-rs/flamegraph#usage-with-benchmarks
 debug = true
diff --git a/compiler/backend_inkwell/Cargo.toml b/compiler/backend_inkwell/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "candy_backend_inkwell"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 candy_frontend = { version = "0.1.0", path = "../frontend" }

diff --git a/compiler/backend_inkwell/src/lib.rs b/compiler/backend_inkwell/src/lib.rs
@@ -857,7 +857,9 @@ impl<'ctx> CodeGen<'ctx> {
             self.builder
                 .build_load(self.candy_value_pointer_type, it.as_pointer_value(), "")
         });
-        if v.is_none() && let Some(index) = function_ctx.captured_ids.iter().position(|i| *i == id) {
+        if v.is_none()
+            && let Some(index) = function_ctx.captured_ids.iter().position(|i| *i == id)
+        {
             let env_ptr = function_ctx.function_value.get_last_param().unwrap();
 
             let env_value = self
@@ -870,9 +872,14 @@ impl<'ctx> CodeGen<'ctx> {
                 )
                 .unwrap();
 
-            v = Some(self.builder.build_load(self.candy_value_pointer_type, env_value, ""));
+            v = Some(
+                self.builder
+                    .build_load(self.candy_value_pointer_type, env_value, ""),
+            );
         }
-        if v.is_none() && let Some(value) = self.locals.get(&id) {
+        if v.is_none()
+            && let Some(value) = self.locals.get(&id)
+        {
             v = Some(*value);
         }
         if self.unrepresented_ids.contains(&id) {

diff --git a/compiler/cli/Cargo.toml b/compiler/cli/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "candy_cli"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.56"
+edition.workspace = true
+rust-version.workspace = true
 default-run = "candy"
 
 [[bin]]

diff --git a/compiler/cli/src/inkwell.rs b/compiler/cli/src/inkwell.rs
@@ -74,7 +74,6 @@ pub fn compile(options: &Options) -> ProgramResult {
             ExecutionTarget::MainFunction(module.clone()),
             TracingConfig::off(),
         )
-        .map(|(mir, errors)| (mir, errors))
         .unwrap_or_else(|error| {
             let payload = CompilerErrorPayload::Module(error);
             let mir = Mir::build(|body| {
@@ -89,7 +88,7 @@ pub fn compile(options: &Options) -> ProgramResult {
 
     if !errors.is_empty() {
         for error in errors.as_ref() {
-            println!("{:?}", error);
+            println!("{error:?}");
         }
         std::process::exit(1);
     }

diff --git a/compiler/formatter/Cargo.toml b/compiler/formatter/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "candy_formatter"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.56"
+edition.workspace = true
+rust-version.workspace = true
 
 [lib]
 

diff --git a/compiler/formatter/src/existing_whitespace.rs b/compiler/formatter/src/existing_whitespace.rs
@@ -118,13 +118,15 @@ impl<'a> ExistingWhitespace<'a> {
         edits: &mut TextEdits,
         other: &mut ExistingWhitespace<'a>,
     ) {
-        if let Some(whitespace) = self.whitespace.first() && whitespace.kind.is_whitespace() {
+        if let Some(whitespace) = self.whitespace.first()
+            && whitespace.kind.is_whitespace()
+        {
             let span = match &mut self.whitespace {
                 Cow::Borrowed(whitespace) => {
                     let (first, remaining) = whitespace.split_first().unwrap();
                     *whitespace = remaining;
                     first.data.span.clone()
-                },
+                }
                 Cow::Owned(whitespace) => whitespace.remove(0).data.span,
             };
             self.start_offset = span.end;
@@ -586,9 +588,8 @@ mod test {
         let mut csts = parse_rcst(source).to_csts();
         assert_eq!(csts.len(), 1);
 
-        let cst = match csts.pop().unwrap().kind {
-            CstKind::Call { receiver, .. } => receiver,
-            _ => panic!("Expected a call"),
+        let CstKind::Call { receiver: cst, .. } = csts.pop().unwrap().kind else {
+            panic!("Expected a call");
         };
         let reduced_source = cst.to_string();
 

diff --git a/compiler/formatter/src/format.rs b/compiler/formatter/src/format.rs
@@ -412,11 +412,8 @@ pub fn format_cst<'a>(
             };
 
             let left_width = if let Some(right_first_line_width) = right_width.first_line_width()
-                && (left_min_width
-                    + SinglelineWidth::SPACE
-                    + bar_width
-                    + right_first_line_width)
-                .fits(info.indentation)
+                && (left_min_width + SinglelineWidth::SPACE + bar_width + right_first_line_width)
+                    .fits(info.indentation)
             {
                 left.into_trailing_with_space(edits)
             } else {
@@ -710,12 +707,13 @@ pub fn format_cst<'a>(
                     ..
                 }] if unparsable_input.is_empty(),
             );
-            let (cases, last_case) = if !only_has_empty_error_case && let [cases @ .., last_case] = cases.as_slice() {
-                (cases, last_case)
-            } else {
-                let (percent_width, whitespace) = percent.split();
-                return FormattedCst::new(expression_width + percent_width, whitespace);
-            };
+            let (cases, last_case) =
+                if !only_has_empty_error_case && let [cases @ .., last_case] = cases.as_slice() {
+                    (cases, last_case)
+                } else {
+                    let (percent_width, whitespace) = percent.split();
+                    return FormattedCst::new(expression_width + percent_width, whitespace);
+                };
 
             let case_info = info
                 .resolve_for_expression_with_indented_lines(
@@ -994,18 +992,25 @@ pub fn format_cst<'a>(
                     body.first().unwrap().unwrap_whitespace_and_comment().kind,
                     CstKind::Assignment { .. },
                 );
-            let assignment_sign_trailing = if !contains_single_assignment && left_width.last_line_fits(
-                info.indentation,
-                assignment_sign.min_width(info.indentation) + SinglelineWidth::SPACE + body_width + body_whitespace_width,
-            ) {
+            let assignment_sign_trailing = if !contains_single_assignment
+                && left_width.last_line_fits(
+                    info.indentation,
+                    assignment_sign.min_width(info.indentation)
+                        + SinglelineWidth::SPACE
+                        + body_width
+                        + body_whitespace_width,
+                ) {
                 TrailingWhitespace::Space
             } else if !contains_single_assignment
                 && !body_whitespace_has_comments
                 && let Some(body_first_line_width) = body_width.first_line_width()
                 && left_width.last_line_fits(
                     info.indentation,
-                    assignment_sign.min_width(info.indentation) + SinglelineWidth::SPACE + body_first_line_width,
-            ) {
+                    assignment_sign.min_width(info.indentation)
+                        + SinglelineWidth::SPACE
+                        + body_first_line_width,
+                )
+            {
                 TrailingWhitespace::Space
             } else {
                 TrailingWhitespace::Indentation(info.indentation.with_indent())
@@ -1059,6 +1064,7 @@ fn format_receiver<'a>(
 }
 
 struct Argument<'a> {
+    #[allow(clippy::struct_field_names)]
     argument: MaybeSandwichLikeArgument<'a>,
     precedence: Option<PrecedenceCategory>,
     parentheses: ExistingParentheses<'a>,

diff --git a/compiler/formatter/src/format_collection.rs b/compiler/formatter/src/format_collection.rs
@@ -49,20 +49,20 @@ pub fn format_collection<'a>(
             let is_comma_required =
                 is_comma_required_due_to_single_item || !is_last_item || item.has_comments();
             let info = if !is_comma_required && let Width::Singleline(min_width) = min_width {
-                    // We're looking at the last item and everything might fit in one line.
-                    let max_width = Width::MAX - min_width;
-                    assert!(!max_width.is_empty());
+                // We're looking at the last item and everything might fit in one line.
+                let max_width = Width::MAX - min_width;
+                assert!(!max_width.is_empty());
 
-                    item_info.with_trailing_comma_condition(
-                        TrailingCommaCondition::UnlessFitsIn(max_width),
-                    )
-                } else {
-                    item_info.clone()
-                };
+                item_info
+                    .with_trailing_comma_condition(TrailingCommaCondition::UnlessFitsIn(max_width))
+            } else {
+                item_info.clone()
+            };
             let item = format_cst(edits, previous_width_for_items, item, &info);
 
             if let Width::Singleline(old_min_width) = min_width
-                    && let Width::Singleline(item_min_width) = item.min_width(info.indentation) {
+                && let Width::Singleline(item_min_width) = item.min_width(info.indentation)
+            {
                 let (item_min_width, max_width) = if is_last_item {
                     (item_min_width, Width::MAX)
                 } else {

diff --git a/compiler/formatter/src/text_edits.rs b/compiler/formatter/src/text_edits.rs
@@ -50,8 +50,7 @@ impl TextEdits {
                 self.edits
                     .get(index)
                     // An edit contains this position.
-                    .map(|it| it.range.contains(&offset))
-                    .unwrap_or_default()
+                    .is_some_and(|it| it.range.contains(&offset))
             })
     }
 

diff --git a/compiler/frontend/Cargo.toml b/compiler/frontend/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "candy_frontend"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.56"
+edition.workspace = true
+rust-version.workspace = true
 
 [lib]
 

diff --git a/compiler/frontend/src/ast.rs b/compiler/frontend/src/ast.rs
@@ -275,7 +275,7 @@ impl AstKind {
             Self::Identifier(Identifier(identifier)) => {
                 let entry = captured_identifiers
                     .entry(identifier.value.clone())
-                    .or_insert_with(Vec::new);
+                    .or_default();
                 entry.push(identifier.id.clone());
             }
             Self::Symbol(_) => {}

diff --git a/compiler/frontend/src/ast_to_hir.rs b/compiler/frontend/src/ast_to_hir.rs
@@ -372,7 +372,7 @@ impl Context<'_> {
                             AstKind::MatchCase(MatchCase { box pattern, body }) => {
                                 let (pattern, pattern_identifiers) = scope.lower_pattern(pattern);
 
-                                let (body, _) = scope.with_scope(None, |scope| {
+                                let (body, ()) = scope.with_scope(None, |scope| {
                                     for (name, (ast_id, identifier_id)) in
                                         pattern_identifiers.clone()
                                     {
@@ -392,7 +392,7 @@ impl Context<'_> {
                                     errors: errors.clone(),
                                 };
 
-                                let (body, _) = scope.with_scope(None, |scope| {
+                                let (body, ()) = scope.with_scope(None, |scope| {
                                     scope.compile(&[]);
                                 });
 
@@ -464,7 +464,7 @@ impl Context<'_> {
                     None,
                 );
                 let then_function_id = self.create_next_id(None, None);
-                let (then_body, _) = self.with_scope(then_function_id.clone(), |scope| {
+                let (then_body, ()) = self.with_scope(then_function_id.clone(), |scope| {
                     scope.push(None, Expression::Reference(hir.clone()), None);
                 });
                 let then_function = self.push_with_existing_id(
@@ -478,7 +478,7 @@ impl Context<'_> {
                 );
 
                 let else_function_id = self.create_next_id(None, None);
-                let (else_body, _) = self.with_scope(else_function_id.clone(), |scope| {
+                let (else_body, ()) = self.with_scope(else_function_id.clone(), |scope| {
                     scope.push(
                         None,
                         Expression::Call {
Benchmark suite	Current: `b0b98e9`	Previous: `7f99bf4`	Ratio
`Time: Compiler/hello_world`	`54854587` ns/iter (`± 1071032`)	`54437870` ns/iter (`± 852073`)	`1.01`
`Time: Compiler/fibonacci`	`253095660` ns/iter (`± 3001089`)	`253139501` ns/iter (`± 7237353`)	`1.00`
`Time: VM Runtime/hello_world`	`39118` ns/iter (`± 83174`)	`38697` ns/iter (`± 48869`)	`1.01`
`Time: VM Runtime/fibonacci/15`	`21317227` ns/iter (`± 168886`)	`21246519` ns/iter (`± 196076`)	`1.00`
`Time: VM Runtime/PLB/binarytrees/6`	`604841178` ns/iter (`± 4462143`)	`620691701` ns/iter (`± 8677387`)	`0.97`