Commit b5bc7b8
committed
fix: resolve merge conflicts and update dependencies for CI
- Resolved merge conflict in src/semantic/analyzer.rs
- Fixed CI Rust version from invalid 1.100.0 to 1.80.0
- Updated dependencies to latest versions:
- cranelift 0.110 -> 0.121
- gimli 0.31 -> 0.32
- thiserror 1.0 -> 2.0
- Fixed numerous format string syntax errors
- Updated Cargo.lock with new dependency versions1 parent 18ecd94 commit b5bc7b8
138 files changed
Lines changed: 792 additions & 919 deletions
File tree
- .github/workflows
- src
- bin
- codegen
- cranelift
- compilation
- debugger
- doc
- error
- inference
- ir
- optimizer
- analysis
- lexer
- lowering
- lsp
- bin
- manuscript
- commands
- mcp
- metaprogramming
- module
- package
- parser
- repl
- runtime
- closure
- security
- semantic
- stdlib
- graphics
- testing
- types
- update
- verification
- tools/devutils/__pycache__
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
177 | 177 | | |
178 | 178 | | |
179 | 179 | | |
180 | | - | |
| 180 | + | |
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
| |||
0 commit comments