diff --git a/Cargo.lock b/Cargo.lock index 5ba9de9..15f9135 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=df2e1372a1b25e19e760b4221ab1b9fceb27a38c#df2e1372a1b25e19e760b4221ab1b9fceb27a38c" +source = "git+https://github.com/ComlineProject/generation?rev=a5b1b319e810fe5723ee94966ec174c6a1b2e7f1#a5b1b319e810fe5723ee94966ec174c6a1b2e7f1" dependencies = [ "comline-core", "eyre", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=7614bbcdf2d6f40b1457e77c125093778ffda9e1#7614bbcdf2d6f40b1457e77c125093778ffda9e1" +source = "git+https://github.com/ComlineProject/comline-rust?rev=6b3f4ffd027b37219efa36e167f769e7362821cc#6b3f4ffd027b37219efa36e167f769e7362821cc" dependencies = [ "comline-codegen", "comline-core", @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=db27ec591c1049cea52b50f3189646083bebe082#db27ec591c1049cea52b50f3189646083bebe082" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=56bea641f6d163120006e853bff4eec4d0a7c88e#56bea641f6d163120006e853bff4eec4d0a7c88e" dependencies = [ "comline-codegen", "comline-core", @@ -418,7 +418,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=c28cc2520c3ed2eeaba32f2b8e59c36a86944973#c28cc2520c3ed2eeaba32f2b8e59c36a86944973" +source = "git+https://github.com/ComlineProject/core?rev=5e6cc3af04964590b43c3c53f8924f474f00951e#5e6cc3af04964590b43c3c53f8924f474f00951e" dependencies = [ "ariadne", "bincode", @@ -450,7 +450,7 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=c28cc2520c3ed2eeaba32f2b8e59c36a86944973#c28cc2520c3ed2eeaba32f2b8e59c36a86944973" +source = "git+https://github.com/ComlineProject/core?rev=5e6cc3af04964590b43c3c53f8924f474f00951e#5e6cc3af04964590b43c3c53f8924f474f00951e" [[package]] name = "concolor" diff --git a/Cargo.toml b/Cargo.toml index 9260c84..66ecd14 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,20 +29,17 @@ toml = "0.8" # needs real I/O (git fetch, filesystem), so it's off by default for # `comline-core`'s wasm32 consumers (the playground editor, the language # server); the CLI is the one consumer that actually runs `comline build`. -comline-core = { git = "https://github.com/ComlineProject/core", rev = "c28cc2520c3ed2eeaba32f2b8e59c36a86944973", features = ["deps"] } -# All three pinned to revs that already agree on comline-core@c28cc25 -# (bare relative globs and the git cache fix, core#64/core#65; core#62's -# embedded std before them) - bumped together: generation#33's first commit -# (comline-rust/comline-typescript's own codegen crates consume -# `comline-codegen`'s types, so this pins the same generation rev they do, -# not a later one), then comline-rust#22 and comline-typescript#19. -# comline-rust's pin includes lib mode's nested-namespace support -# (comline-rust#21): std's own embedded schemas merge as `std/validators` -# etc, so `comline generate` failed on any project that imported from std -# at all before it. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "df2e1372a1b25e19e760b4221ab1b9fceb27a38c" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "7614bbcdf2d6f40b1457e77c125093778ffda9e1", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "db27ec591c1049cea52b50f3189646083bebe082", optional = true } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "5e6cc3af04964590b43c3c53f8924f474f00951e", features = ["deps"] } +# All three pinned to revs that already agree on comline-core@5e6cc3a +# (core#67's block-comment support) - bumped together: generation#34's +# branch-tip commit (comline-rust/comline-typescript's own codegen crates +# consume `comline-codegen`'s types, so this pins the exact same generation +# rev they do - a5b1b31, not generation's later merge commit, since Cargo +# only unifies a git dependency across byte-identical revs), then +# comline-rust#23 and comline-typescript#20. +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "a5b1b319e810fe5723ee94966ec174c6a1b2e7f1" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "6b3f4ffd027b37219efa36e167f769e7362821cc", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "56bea641f6d163120006e853bff4eec4d0a7c88e", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole