bcd41810f4
Reader-facing prose and rustdoc carried opaque shorthand like
"Decision 10", "clause-5", "mq.1", "ct.1", "eob.1", "rpe.1",
"post-mq.3", and "Iter 22b.1:" with no in-repo definition the reader
could follow. This commit replaces every such occurrence in the
durable tier the reader is most likely to land on (design/ ledger +
source //! module headers + the central /// public-item rustdoc) with
an inline content phrase plus, where applicable, a Markdown link to
the file that defines the referenced concept.
design/ ledger — 16 files:
Definition-site headings demoted from "Decision N: <title>" to
"<title>": authoring-surface, tail-calls, memory-model section in
rc-uniqueness.md, dual-allocator section, typeclass design,
effects "pure core + algebraic effects".
Cross-reference sites: "Decision 1" -> canonical-schema principle
(data-model); "Decision 3/4" -> effects + scope-boundaries; "Decision
6" -> authoring-surface; "Decision 8" -> tail-calls; "Decision 9" ->
rc-uniqueness (dual-allocator); "Decision 10" -> memory-model;
"Decision 11" -> typeclasses (model). "clause-5" -> body-link
durability gate. "clause-3" (in language-constraints) ->
bug-class-reintroduction discriminator. "mq.1/2/3", "ct.1/4",
"eob.1", "rpe.1" -> the canonical-form rule / the type-driven
dispatch / the Str carve-out / etc. "post-mq.3" -> "type-driven".
design/contracts/feature-acceptance.md: file-local "clauses 1/2/3"
-> "criteria 1/2/3" (sprachliche Kohärenz mit der File-Überschrift
"Feature-acceptance criterion"); "the clause-3 mechanism" -> "the
bug-class-reintroduction discriminator".
Source //! module headers — 24 files:
Stripped "Iter X.Y:" prefixes and "(Decision N)" / "(mq.X)" tags
from spec_drift, uniqueness, reuse_shape, migrate_canonical_types,
typeclass_22b{2,3,c}, suppress_filter, lift, mono, linearity,
diagnostic, method_dispatch_pin, method_collision_pin,
no_per_type_print_ops, mq3_multi_class_e2e, print_mono_body_shape,
print_no_leak_pin, cli_diag_human_workspace_load_error,
ct1_check_cli, prose snapshot, unbound_in_instance_method_pin,
mono_xmod_ctor_pattern, desugar.
Central /// public-item rustdoc:
ast.rs (full sweep — every "Iter X" + "Decision N" prefix
reformulated; mode/Type::Fn rustdoc now points at memory-model.md;
Constraint / SuperclassRef / InstanceDef / ClassDef rustdoc points
at typeclasses contract).
diagnostic.rs (all "(Iter X)" / "(mq.X)" tags on diagnostic codes
removed).
lib.rs (FORM_A_SPEC rustdoc points at authoring-surface.md
instead of "Decision 6").
canonical.rs (type_hash + Float-literal rustdoc).
Still outstanding (for a follow-up commit): ~500 inline `//`
code-body comments with `Iter X.Y` markers across the workspace, and
a handful of `///` rustdoc items in hash_pin / workspace_pin / lift /
mono / suppress_filter test-pin and internal-function bodies. Code
identifiers (test filenames like `mq3_multi_class_e2e.rs`, function
names like `iter18e_drop_iterative_default_preserves_hashes`) stay
verbatim per the user's "code identifiers stay verbatim" rule.
Tests: design_index_pin 5/5 + docs_honesty_pin 5/5; workspace builds
clean; full `cargo test --workspace` previously green (every
`test result: ok` line, no FAILED line).
111 lines
4.4 KiB
Rust
111 lines
4.4 KiB
Rust
//! End-to-end coverage of the post-`MethodNameCollision`-
|
|
//! retirement multi-candidate dispatch path. Three positive fixtures
|
|
//! exercise the three trajectories from the milestone spec
|
|
//! §"Data flow":
|
|
//!
|
|
//! - Trajectory C — ambiguous bare-method call with both candidate
|
|
//! classes shipping `Show Int`. Typecheck rejects with
|
|
//! `ambiguous-method-resolution`.
|
|
//! - Trajectory E — explicit qualifier `<module>.<Class>.<method>`
|
|
//! resolves cleanly to the named class.
|
|
//! - Class-fn shadow — bare-method call where both a class method and
|
|
//! a free fn of the same name exist. Fn wins per lookup precedence;
|
|
//! `class-method-shadowed-by-fn` warning fires so the LLM-author
|
|
//! sees the shadow.
|
|
//!
|
|
//! Each test invokes `ail check --json <entry>` and asserts on the
|
|
//! diagnostic stream's `code` field. Stdout / runtime behaviour is
|
|
//! out of scope here — the dispatch path is a check-time concern.
|
|
|
|
use std::path::PathBuf;
|
|
use std::process::Command;
|
|
|
|
fn ail_bin() -> PathBuf {
|
|
PathBuf::from(env!("CARGO_BIN_EXE_ail"))
|
|
}
|
|
|
|
fn examples_dir() -> PathBuf {
|
|
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
|
.join("..")
|
|
.join("..")
|
|
.join("examples")
|
|
}
|
|
|
|
fn run_ail_check_json(entry: &str) -> std::process::Output {
|
|
Command::new(ail_bin())
|
|
.args(["check", "--json", examples_dir().join(entry).to_str().unwrap()])
|
|
.output()
|
|
.expect("ail binary must launch")
|
|
}
|
|
|
|
/// mq.3.6 (Trajectory C): bare `show 42` in a workspace with two
|
|
/// `Show` classes (modA and modB) each shipping `Show Int` is
|
|
/// genuinely ambiguous. `ail check` rejects with
|
|
/// `ambiguous-method-resolution` and names both candidate classes.
|
|
#[test]
|
|
fn mq3_two_show_ambiguous_fires_ambiguous_method_resolution() {
|
|
let out = run_ail_check_json("mq3_two_show_ambiguous.ail");
|
|
assert!(
|
|
!out.status.success(),
|
|
"expected check to reject ambiguous dispatch; stdout={} stderr={}",
|
|
String::from_utf8_lossy(&out.stdout),
|
|
String::from_utf8_lossy(&out.stderr),
|
|
);
|
|
let stdout = String::from_utf8(out.stdout).expect("stdout is utf-8");
|
|
let diags: serde_json::Value =
|
|
serde_json::from_str(&stdout).expect("--json mode emits a JSON array on stdout");
|
|
let arr = diags.as_array().expect("diagnostics is a JSON array");
|
|
assert!(
|
|
arr.iter().any(|d| d["code"] == "ambiguous-method-resolution"),
|
|
"expected `ambiguous-method-resolution` diagnostic; got {stdout}",
|
|
);
|
|
// Both candidate classes named in the diagnostic so the author
|
|
// knows which qualifiers to choose from.
|
|
assert!(
|
|
stdout.contains("mq3_two_show_ambiguous_a.Show"),
|
|
"expected candidate A in diagnostic; got {stdout}",
|
|
);
|
|
assert!(
|
|
stdout.contains("mq3_two_show_ambiguous_b.Show"),
|
|
"expected candidate B in diagnostic; got {stdout}",
|
|
);
|
|
}
|
|
|
|
/// mq.3.6 (Trajectory E): explicit qualifier
|
|
/// `mq3_two_show_ambiguous_a.Show.show 42` disambiguates the same
|
|
/// workspace as the ambiguous fixture. Typecheck succeeds.
|
|
#[test]
|
|
fn mq3_two_show_qualified_resolves_clean() {
|
|
let out = run_ail_check_json("mq3_two_show_qualified.ail");
|
|
assert!(
|
|
out.status.success(),
|
|
"expected check to succeed with explicit qualifier; stdout={} stderr={}",
|
|
String::from_utf8_lossy(&out.stdout),
|
|
String::from_utf8_lossy(&out.stderr),
|
|
);
|
|
}
|
|
|
|
/// mq.3.6 (class-fn shadow): bare `myeq 1 2` in a workspace with
|
|
/// `class MyEq { myeq }` in one module and `fn myeq` in another
|
|
/// resolves to the fn per lookup precedence. Typecheck succeeds AND
|
|
/// the structured warning `class-method-shadowed-by-fn` fires so the
|
|
/// LLM-author sees the shadow.
|
|
#[test]
|
|
fn mq3_class_eq_vs_fn_eq_fn_wins_with_warning() {
|
|
let out = run_ail_check_json("mq3_class_eq_vs_fn_eq.ail");
|
|
assert!(
|
|
out.status.success(),
|
|
"expected check to succeed (fn wins); stdout={} stderr={}",
|
|
String::from_utf8_lossy(&out.stdout),
|
|
String::from_utf8_lossy(&out.stderr),
|
|
);
|
|
let stdout = String::from_utf8(out.stdout).expect("stdout is utf-8");
|
|
let diags: serde_json::Value =
|
|
serde_json::from_str(&stdout).expect("--json mode emits a JSON array on stdout");
|
|
let arr = diags.as_array().expect("diagnostics is a JSON array");
|
|
assert!(
|
|
arr.iter().any(|d| d["code"] == "class-method-shadowed-by-fn"),
|
|
"expected `class-method-shadowed-by-fn` warning; got {stdout}",
|
|
);
|
|
}
|