Merge pull request #27 from sdiehl/copilot/update-ariadne-requirement

Update ariadne dependency from 0.5 to 0.6

Author: sdiehl

algorithm-w/src/lib.rs

@@ -2,12 +2,16 @@ pub mod ast;
 pub mod errors;
 pub mod infer;
 
-use lalrpop_util::lalrpop_mod;
-lalrpop_mod!(pub parser);
-
+#[allow(clippy::all)]
+#[allow(clippy::unwrap_in_result)]
+mod parser_impl {
+    use lalrpop_util::lalrpop_mod;
+    lalrpop_mod!(pub parser);
+}
 use std::fs;
 
 use infer::infer_type_only;
+pub use parser_impl::parser;
 
 /// Result of running a golden test with detailed line-by-line comparison
 #[derive(Debug)]

algorithm-w/src/main.rs

@@ -2,14 +2,18 @@ mod ast;
 mod errors;
 mod infer;
 
-use lalrpop_util::lalrpop_mod;
-lalrpop_mod!(pub parser);
-
+#[allow(clippy::all)]
+#[allow(clippy::unwrap_in_result)]
+mod parser_impl {
+    use lalrpop_util::lalrpop_mod;
+    lalrpop_mod!(pub parser);
+}
 use std::fs;
 
 use algorithm_w::{process_test_lines, run_golden_test_detailed};
 use clap::{Parser, Subcommand};
 use infer::{infer_type_only, run_inference};
+pub use parser_impl::parser;
 use rustyline::error::ReadlineError;
 use rustyline::DefaultEditor;
 

coc/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 lalrpop-util = { version = "0.22.2", features = ["lexer", "unicode"] }
 logos = "0.15.1"
-ariadne = "0.5"
+ariadne = "0.6"
 thiserror = "2.0"
 
 [build-dependencies]

coc/src/parse.rs

@@ -1,10 +1,14 @@
-use lalrpop_util::lalrpop_mod;
-
 use crate::ast::{Module, Term};
 use crate::errors::{CocResult, ParseError};
 use crate::lexer::{Lexer, LexicalError, Token};
 
-lalrpop_mod!(pub parser);
+#[allow(clippy::all)]
+#[allow(clippy::unwrap_in_result)]
+mod parser_impl {
+    use lalrpop_util::lalrpop_mod;
+    lalrpop_mod!(pub parser);
+}
+use parser_impl::parser;
 
 /// Parser wrapper that bridges the LALRPOP parser with our lexer
 pub struct Parser {

system-f-omega/Cargo.toml

@@ -14,7 +14,7 @@ codegen = ["dep:cranelift", "dep:cranelift-module", "dep:cranelift-object", "dep
 lalrpop-util = { version = "0.22.2", features = ["lexer", "unicode"] }
 logos = "0.15"
 thiserror = "2.0"
-ariadne = "0.5"
+ariadne = "0.6"
 clap = { version = "4.0", features = ["derive"] }
 
 # Cranelift backend dependencies

system-f-omega/src/codegen/executable.rs

@@ -65,20 +65,27 @@ pub fn compile_executable(module: &CoreModule, output_path: &str) -> Result<(),
     // Create cranelift module
     let triple = if cfg!(target_arch = "aarch64") && cfg!(target_os = "macos") {
         // Use the proper ARM64 macOS triple
-        target_lexicon::Triple::from_str("aarch64-apple-darwin").unwrap()
+        target_lexicon::Triple::from_str("aarch64-apple-darwin")
+            .map_err(|e| format!("Error parsing triple: {}", e))?
     } else {
         Triple::host()
     };
 
     let mut settings = builder();
-    settings.set("opt_level", "none").unwrap();
-    settings.set("is_pic", "true").unwrap();
+    settings
+        .set("opt_level", "none")
+        .map_err(|e| format!("Error setting opt_level: {}", e))?;
+    settings
+        .set("is_pic", "true")
+        .map_err(|e| format!("Error setting is_pic: {}", e))?;
     if cfg!(target_arch = "aarch64") {
         // Ensure proper alignment for ARM64
         settings
             .set("enable_heap_access_spectre_mitigation", "false")
-            .unwrap();
-        settings.set("use_colocated_libcalls", "false").unwrap();
+            .map_err(|e| format!("Error setting heap_access_spectre_mitigation: {}", e))?;
+        settings
+            .set("use_colocated_libcalls", "false")
+            .map_err(|e| format!("Error setting use_colocated_libcalls: {}", e))?;
     }
     let flags = Flags::new(settings);
 

system-f-omega/src/main.rs

@@ -217,12 +217,12 @@ fn typecheck_module(source: &str, filename: &str) -> Result<(), ()> {
         Ok(module) => module,
         Err(CompilerError::Type(type_error)) => {
             let report = type_error.report(source, filename);
-            report.eprint((filename, Source::from(source))).unwrap();
+            let _ = report.eprint((filename, Source::from(source)));
             return Err(());
         }
         Err(CompilerError::Parse(parse_error)) => {
             let report = parse_error.report(source, filename);
-            report.eprint((filename, Source::from(source))).unwrap();
+            let _ = report.eprint((filename, Source::from(source)));
             return Err(());
         }
     };
@@ -271,7 +271,7 @@ fn typecheck_module(source: &str, filename: &str) -> Result<(), ()> {
             Err(type_error) => {
                 println!("✗");
                 let report = type_error.report(source, filename);
-                report.eprint((filename, Source::from(source))).unwrap();
+                let _ = report.eprint((filename, Source::from(source)));
                 return Err(());
             }
         }

system-f-omega/src/parse.rs

@@ -1,11 +1,16 @@
 use ariadne::Source;
-use lalrpop_util::lalrpop_mod;
 
 use crate::errors::{ParseError, ParseResult};
 use crate::lexer::{Lexer, LexicalError, Token};
 use crate::surface::Module;
 
-lalrpop_mod!(pub parser);
+#[allow(clippy::all)]
+#[allow(clippy::unwrap_in_result)]
+mod parser_impl {
+    use lalrpop_util::lalrpop_mod;
+    lalrpop_mod!(pub parser);
+}
+use parser_impl::parser;
 
 pub struct Parser {
     module_parser: parser::ModuleParser,

system-f/Cargo.toml

@@ -10,7 +10,7 @@ workspace = true
 lalrpop-util = { version = "0.22.2", features = ["lexer", "unicode"] }
 thiserror = "2.0"
 clap = { version = "4.0", features = ["derive"] }
-ariadne = "0.5"
+ariadne = "0.6"
 
 [build-dependencies]
 lalrpop = { version = "0.22.2", features = ["lexer", "unicode"] }

system-f/src/lib.rs

@@ -3,5 +3,10 @@ pub mod errors;
 pub mod testing;
 pub mod typecheck;
 
-use lalrpop_util::lalrpop_mod;
-lalrpop_mod!(pub parser);
+#[allow(clippy::all)]
+#[allow(clippy::unwrap_in_result)]
+mod parser_impl {
+    use lalrpop_util::lalrpop_mod;
+    lalrpop_mod!(pub parser);
+}
+pub use parser_impl::parser;