Merge pull request #40 from sezna/ci

initial ci

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+
+name: CI
+on:
+  pull_request: { branches: "*" }
+  push: { branches: "main" }
+env:
+  RUSTFLAGS: "-Dwarnings"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Machete
+        uses: bnjbvr/cargo-machete@main
+
+  clippy_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run Clippy
+        run: cargo clippy --all-targets --all-features

pete/Cargo.toml

@@ -17,8 +17,8 @@ petr-resolve = { "path" = "../petr-resolve", optional = true }
 petr-pkg = { "path" = "../petr-pkg" }
 petr-profiling = { path = "../petr-profiling" }
 miette = { version = "7.2.0", features = ["fancy"] }
-thiserror = "1.0.61"
-toml = "0.8.14"
+thiserror = "1.0"
+toml = "0.8"
 
 [features]
 debug = ["petr-utils/debug", "petr-resolve/debug"]

pete/src/main.rs

@@ -10,6 +10,17 @@ use petr_pkg::BuildPlan;
 use petr_utils::{IndexMap, SourceId, SpannedItem};
 use petr_vm::Vm;
 
+mod error {
+    use thiserror::Error;
+    #[derive(Error, Debug)]
+    pub enum PeteError {
+        #[error(transparent)]
+        IoError(#[from] std::io::Error),
+        #[error(transparent)]
+        TomlSeriatlizeError(#[from] toml::ser::Error),
+    }
+}
+
 #[derive(ClapParser)]
 #[command(version = "0.0", author = "Alex H <alex@alex-hansen.com>")]
 struct Cli {
@@ -63,7 +74,7 @@ enum Commands {
     },
 }
 
-fn main() {
+fn main() -> Result<(), error::PeteError> {
     let cli = Cli::parse();
 
     match cli.command {
@@ -148,7 +159,7 @@ fn main() {
             timings.end("load files");
 
             timings.start("format");
-            petr_fmt::format_sources(files, manifest.formatter.into()).expect("TODO errs");
+            petr_fmt::format_sources(files, manifest.formatter.into())?;
             timings.end("format");
 
             if time {
@@ -163,9 +174,9 @@ fn main() {
         },
         Commands::Ir { path } => {
             let (lockfile, buf, _build_plan) = load_project_and_dependencies(&path);
-            let lockfile_toml = toml::to_string(&lockfile).expect("Failed to serialize lockfile to TOML");
+            let lockfile_toml = toml::to_string(&lockfile)?;
             let lockfile_path = path.join("petr.lock");
-            fs::write(lockfile_path, lockfile_toml).expect("Failed to write lockfile");
+            fs::write(lockfile_path, lockfile_toml)?;
 
             // convert pathbufs into strings for the parser
             let buf = buf
@@ -201,6 +212,7 @@ fn main() {
             println!("{}", lowerer.pretty_print());
         },
     }
+    Ok(())
 }
 
 fn load_project_and_dependencies(path: &Path) -> (petr_pkg::Lockfile, Vec<(PathBuf, String)>, BuildPlan) {

petr-codegen/Cargo.toml

@@ -10,7 +10,7 @@ petr-ir = { path = "../petr-ir" }
 
 cranelift = "0.108.1"
 cranelift-native = "0.108.1"
-cranelift-reader = "0.108.1"
+# cranelift-reader = "0.108.1"
 cranelift-object = { version = "0.108.1" }
 cranelift-module = "0.108.1"
 

petr-fmt/Cargo.toml

@@ -10,7 +10,6 @@ petr-parse = { path = "../petr-parse" }
 petr-utils = { path = "../petr-utils" }
 petr-ast = { path = "../petr-ast" }
 structopt = { version = "0.3.26", features = ["color"] }
-serde = { version = "1.0.203", features = ["derive"] }
 
 [dev-dependencies]
 expect-test = "1.5.0"

petr-ir/Cargo.toml

@@ -6,8 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-miette = { version = "7.2.0", features = ["fancy"] }
-thiserror = "1.0.61"
 petr-utils = { path = "../petr-utils" }
 petr-typecheck = { path = "../petr-typecheck" }
 

petr-ir/src/lib.rs

@@ -205,7 +205,7 @@ impl Lowerer {
         lit: &petr_typecheck::Literal,
     ) -> DataLabel {
         use petr_typecheck::Literal::*;
-        
+
         self.data_section.insert(match lit {
             Integer(val) => DataSectionEntry::Int64(*val),
             Boolean(val) => DataSectionEntry::Bool(*val),

petr-manifest/Cargo.toml

@@ -2,9 +2,3 @@
 name = "petr-manifest"
 version = "0.1.0"
 edition = "2021"
-
-[dependencies]
-serde = { version = "1.0.203", features = ["derive"] }
-petr-fmt = { path = "../petr-fmt" }
-petr-pkg = { path = "../petr-pkg" }
-toml = "0.8.14"

petr-pkg/Cargo.toml

@@ -11,4 +11,3 @@ git2 = "0.19.0"
 serde = { version = "1.0.203", features = ["derive"] }
 toml = "0.8.14"
 petr-fmt = { path = "../petr-fmt" }
-petgraph = "0.6.5"

petr-utils/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 lazy_static = { version = "1.4.0", optional = true }
 miette = { version = "7.2.0", features = ["fancy"] }
-thiserror = "1.0.61"
 
 [features]
 debug = ["lazy_static"]

petr-utils/src/common_types.rs

@@ -41,9 +41,9 @@ impl From<usize> for SymbolId {
     }
 }
 #[cfg(feature = "debug")]
-impl Into<usize> for SymbolId {
-    fn into(self) -> usize {
-        self.0
+impl From<SymbolId> for usize {
+    fn from(o: SymbolId) -> usize {
+        o.0
     }
 }
 #[cfg(feature = "debug")]