Skip to content

Commit

Permalink
Merge pull request #1046 from g-r-a-n-t/core-local-ingots
Browse files Browse the repository at this point in the history
Local and core ingot support.
  • Loading branch information
g-r-a-n-t authored Jan 25, 2025
2 parents 4e24af3 + ec28d41 commit 0772d06
Show file tree
Hide file tree
Showing 23 changed files with 840 additions and 41 deletions.
97 changes: 96 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ hir = { path = "crates/hir", package = "fe-hir" }
hir-analysis = { path = "crates/hir-analysis", package = "fe-hir-analysis" }
parser = { path = "crates/parser", package = "fe-parser" }
test-utils = { path = "crates/test-utils", package = "fe-test-utils" }
resolver = { path = "crates/resolver", package = "fe-resolver" }

camino = "1.1.9"
clap = { version = "4.5.26", features = ["derive"] }
Expand All @@ -24,6 +25,8 @@ paste = "1.0.15"
salsa = { git = "https://github.com/salsa-rs/salsa", rev = "e4d65a656fc68d0fb759b292ceae2aff2c785c5d" }
smallvec = { version = "1.13.2", features = ["union"] }
wasm-bindgen-test = "0.3"
glob = "0.3.2"
semver = "1.0.24"

[profile.dev]
# Set to 0 to make the build faster and debugging more difficult.
Expand Down
2 changes: 1 addition & 1 deletion crates/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ camino.workspace = true
indexmap = "2.7"
paste.workspace = true
salsa.workspace = true
semver = "1.0.24"
semver.workspace = true
smol_str = "0.3.2"

parser.workspace = true
4 changes: 2 additions & 2 deletions crates/common/src/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ pub enum IngotKind {
/// An external ingot which is depended on by the current ingot.
External,

/// Standard library ingot.
Std,
/// Core library ingot.
Core,
}

#[derive(Debug, Clone, PartialEq, Eq, Hash)]
Expand Down
2 changes: 2 additions & 0 deletions crates/driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ camino.workspace = true
clap.workspace = true
codespan-reporting.workspace = true
salsa.workspace = true
include_dir = "0.7"

common.workspace = true
hir.workspace = true
hir-analysis.workspace = true
resolver.workspace = true
Loading

0 comments on commit 0772d06

Please sign in to comment.