Repository navigation
Pin core, generation, generators and runtime conformance at their reorganized tips - #147
Merged
Merged
Conversation
added 2 commits
November 10, 2026 02:56
…their reorganized tips; take @Unverified reasons already rendered (core#239)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves the CLI to core
1669a2f(which has core#239:unverified::protocols()gives each reason already rendered and quoted) and to the generators and runtime that agree on it, with the runtime reorganization's paths (ComlineProject/runtime#111) folded in.Pins
comline-coreb9332091669a2fe4dbc5592a96a2964d7ae13e985b76701comline-codegen,comline-doc-markdown,comline-doc-html(generation)bb89a516a73541e142ba5895fd628ee444449694382e70acomline-codegen-rustde0b8e5eb04c130356e44a2b88b74a6805e24d0e80bdbcccomline-codegen-typescript9952c5a4cad8af36f807f395bdf83dcc29aa290187ca0d0comline-runtime-conformancecf5e0673b9cc9dc53a83fb2830d91b267bd5f477f0a1e51(runtime main)tests/fixtures/conformance:comline-referencecf5e0673b9cc9dtests/fixtures/generators: generation crates55d3fdc6a73541tests/fixtures/generators:comline-codegen-rustbe90c80eb04c13Generation is at
6a73541, not at generation's current master (a393c8f): comline-rusteb04c13and comline-typescript4cad8afpin6a73541, and Cargo only unifies a git dependency across identical rev strings.a393c8fdiffers from6a73541only in generation's conformance goldens and dev-deps (generation#131), so the generator crates are the same code. The fixture generators are real pins the tests build (tests/cli/external.rs,conformance.rs), and are meant to be the same revs as the CLI's so output compares byte for byte.Code
src/commands/accept.rs: the reason now arrives rendered and quoted, soreason: reason.map(str::to_string)becomesreason, and the messageformat!(": \"{r}\"")becomesformat!(": {r}"). No fallout insrc/commands/conformance.rsfrom the runtime-conformance bump: it usesrunner::{judge, parse_reply, questions, Corpus, FactProof, OPS_PROTOCOL},Answer,Case,OutcomeandProfile, whose public surface didn't change in runtime#88..main (the catalog-backed fact constants were added).Lockfiles
Cargo.lockand the two fixture lockfiles are tracked and were updated bycargo fetchonly (nocargo update,generate-lockfile, or build). Package-level diff, by name and version:Cargo.lock(418 -> 396 packages): the pinned git crates above change source;comline-catalogis added twice (the specification's, which core already used by pin, and the runtime's vendored copy, whichcomline-runtime-conformancenow depends on); and these registry crates are dropped because the runtime no longer buildspackage_abi:abi_stable{,_derive,_shared},as_derive_utils,const_panic,core_extensions{,_proc_macros},generational-arena,libloading(0.7.4, 0.8.9),lock_api,parking_lot{,_core},paste,redox_syscall,repr_offset,rustc_version,tstr{,_proc_macros},typed-arena,typewit,winapi*. No registry crate changes version.tests/fixtures/conformance/Cargo.lock(55 -> 22): the three runtime crates move to3b9cc9d,comline-catalogis added, and the same kind of removals, plus a few others that onlypackage_abipulled in (crossbeam-*,libc,scopeguard,semver,smallvec,windows-link,syn1.0.109,bitflags,cfg-if). No version changes.tests/fixtures/generators/Cargo.lock(68 -> 69): core (d11d82b->1669a2f), the generation crates andcomline-codegen-rustchange source;comline-catalogis added. No registry change.Part of ComlineProject/runtime#111; follows core#239 (and core#240, generation#130/#131, comline-rust#116/#117, comline-typescript#155). Closes no issue.
Testing
Not built or run locally; CI covers it (build, test, clippy, rustfmt, wasm fixtures).