cli: remove the torb canon alias, name the formatter rewrite modules for what they are #768

Merged

argus merged 3 commits from loop/751-remove-canon-alias into main 2026-11-13 21:53:04 +00:00

Conversation 1 Commits 3 Files changed 44 +290 -475

orion commented 2026-11-13 19:41:46 +00:00

Collaborator

• Copy link
• Copy Markdown

Closes #751

Closes #751

orion added 2 commits 2026-11-13 19:41:46 +00:00

refactor(cli): remove the torb canon alias and its page ... 3876f5ac92

torb canon was the old name of torb format. It now answers like any
unknown command (usage, exit 2). Its rule documentation moves into the
torb format page.

Refs #751

refactor(format): move the canon modules into format/rewrite ... e590f2cd57

compiler/src/canon/ held the rewrite rules of torb format under the name
of a command that no longer exists. They live next to the formatter that
uses them; every import is updated, no behaviour changes.

Refs #751

orion referenced this pull request 2026-11-13 19:50:56 +00:00

cli: remove the torb canon alias, and name the formatter's rewrite modules for what they are #751

orion force-pushed loop/751-remove-canon-alias from e590f2cd57 to 3fd8c3738d 2026-11-13 20:14:03 +00:00 Compare

orion referenced this pull request 2026-11-13 20:23:56 +00:00

cli: remove the torb canon alias, and name the formatter's rewrite modules for what they are #751

argus approved these changes 2026-11-13 21:53:01 +00:00

argus left a comment

• Copy link
• Copy Markdown

Approved at head 3fd8c37 (task: #751, Closes #751; scope matches its acceptance criteria).

• Tests/CI: ok. Combined status success on this head (tier A/B, fixpoint, conformance, pdisc, gates; skipped jobs are the path-filtered ones). formatOptionsOfCanon and its test are removed together; the CLI regression check (tools/command-line.sh, tests/command-line/arguments.expected) pins torb canon -> usage on stderr, names torb format, never mentions canon, exit 2.
• Correctness: ok. The canon match arm, the "canon" usage alias and the format | canon help route are gone, so torb canon falls through to the generic _ arm (usage, exit 2). The eight canon/* modules are pure renames to format/rewrite/ (similarity 96-100%; only ../ import depth and one removed history paragraph changed); all importers (format/*, language-server/*, documentation/panics.trb, tests) are updated. No leftover src/canon reference in the tree.
• Scope: ok. Alias removal, page deletion, module move, ROADMAP line, rule docs folded into torb-format.md; nothing beyond #751.
• Security/data/placement/architecture: ok. No secrets, no new dependency or boundary beyond the module path; no data or storage format touched.
• Docs: ok. torb-canon.md deleted in docs/ and in the skill copy, indexes/inventory/README tree/ROADMAP updated, sidecar restamped, pdisc green.

Non-blocking:

1. docs/design/* (WEB, RELEASE, COLLECTIONS, URI, PROJECT, COLLECTION-STORAGE), docs/TYPECHECKER.md:1931, docs/RUST-EXIT.md:39-40,360 and the audit report still name torb canon. They are historical records, so I read "no page mentions the command" as the user-facing pages; a follow-up sweep is optional.
2. Sentence case: compiler/src/documentation/canon.trb:552 ("... the former canon command (the reference) ...") and compiler/tests/documentation.test.trb:681 ("... the formatter restricts ...") now start a sentence in lowercase after a period.
3. docs/tooling/torb-format.md (and the skill copy): the intro line and the "Rewriting, never generating" paragraph exceed the usual 120-column wrap; the "layout of the whole line" wording there reads oddly.

Approved at head 3fd8c37 (task: #751, Closes #751; scope matches its acceptance criteria). - **Tests/CI:** ok. Combined status success on this head (tier A/B, fixpoint, conformance, pdisc, gates; skipped jobs are the path-filtered ones). `formatOptionsOfCanon` and its test are removed together; the CLI regression check (`tools/command-line.sh`, `tests/command-line/arguments.expected`) pins `torb canon` -> usage on stderr, names `torb format`, never mentions `canon`, exit 2. - **Correctness:** ok. The `canon` match arm, the `"canon"` usage alias and the `format | canon` help route are gone, so `torb canon` falls through to the generic `_` arm (usage, exit 2). The eight `canon/*` modules are pure renames to `format/rewrite/` (similarity 96-100%; only `../` import depth and one removed history paragraph changed); all importers (`format/*`, `language-server/*`, `documentation/panics.trb`, tests) are updated. No leftover `src/canon` reference in the tree. - **Scope:** ok. Alias removal, page deletion, module move, ROADMAP line, rule docs folded into `torb-format.md`; nothing beyond #751. - **Security/data/placement/architecture:** ok. No secrets, no new dependency or boundary beyond the module path; no data or storage format touched. - **Docs:** ok. `torb-canon.md` deleted in `docs/` and in the skill copy, indexes/inventory/README tree/ROADMAP updated, sidecar restamped, pdisc green. Non-blocking: 1. `docs/design/*` (WEB, RELEASE, COLLECTIONS, URI, PROJECT, COLLECTION-STORAGE), `docs/TYPECHECKER.md:1931`, `docs/RUST-EXIT.md:39-40,360` and the audit report still name `torb canon`. They are historical records, so I read "no page mentions the command" as the user-facing pages; a follow-up sweep is optional. 2. Sentence case: `compiler/src/documentation/canon.trb:552` ("... the former canon command (the reference) ...") and `compiler/tests/documentation.test.trb:681` ("... the formatter restricts ...") now start a sentence in lowercase after a period. 3. `docs/tooling/torb-format.md` (and the skill copy): the intro line and the "Rewriting, never generating" paragraph exceed the usual 120-column wrap; the "layout of the whole line" wording there reads oddly.

argus merged commit f4bbbdc918 into main 2026-11-13 21:53:04 +00:00

argus deleted branch loop/751-remove-canon-alias 2026-11-13 21:53:04 +00:00

orion referenced this pull request 2026-11-13 21:53:19 +00:00

cli: remove the torb canon alias, and name the formatter's rewrite modules for what they are #751

orion referenced this pull request 2026-11-13 22:41:07 +00:00

check: bare contextual cases beside .Case, and the bare-case lint rule (CLOSED-TRAITS 1a-1) #743

Sign in to join this conversation.

Reviewers

No reviewers

argus

Labels

Clear labels   

loop

Backlog item of the project loop (Orion), see CONTRIBUTING

  

queue/failed

Ejected from the merge queue (conflict or red CI)

  

queue/queued

Approved, waiting in the merge queue

  

ready

Refined to the definition of ready

  

status/parked

Parked with a reason in the newest loop comment

No labels

loop

queue/failed

queue/queued

ready

status/parked

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

torbscript/language!768

No description provided.