Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions codegen/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ impl<'de> Deserialize<'de> for VersionSpec {
}
}

/// `comline.toml`: where `comline generate` writes code, and how. Which
/// `comline.toml`: where `comline generation` writes code, and how. Which
/// languages are generated comes from `config.idp`'s
/// `code_generation.languages`; this file says where each one lands.
// An absent file parses as `Self::default`.
Expand Down Expand Up @@ -340,7 +340,7 @@ pub struct Target {
/// package declares under `code_generation.languages` in `config.idp`.
/// With `generator`, it also picks among the languages that generator
/// offers, and may be left out when it offers one.
// `comline generate` fills it in from the generator before [`resolve`].
// `comline generation` fills it in from the generator before [`resolve`].
#[serde(default)]
#[schemars(transform = no_default)]
pub language: String,
Expand Down Expand Up @@ -581,7 +581,7 @@ pub struct DeclaredLang {
pub lang_version: String,
}

/// CLI flag overrides for `comline generate`.
/// CLI flag overrides for `comline generation`.
#[derive(Debug, Default)]
pub struct Overrides<'a> {
pub target: Option<&'a str>,
Expand Down Expand Up @@ -631,7 +631,7 @@ pub struct ResolvedTarget {
}

/// Merge `comline.toml`, the congregation's declared languages and CLI flags
/// into the concrete set of targets `generate` should emit.
/// into the concrete set of targets `comline generation` should emit.
///
/// **The declared languages are the set.** `config.idp`'s
/// `code_generation.languages` says which languages this package is generated
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/encodings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub fn used(
/// [`official::units`], `declared` the frozen configs of the package and its
/// dependencies (anything but [`ConfigUnit::Encoding`] is skipped). A
/// framing nothing in view declares writes no JSON. What [`fill`] uses, so
/// an editor calling this expects what `comline generate` will.
/// an editor calling this expects what `comline generation` will.
pub fn used_as_declared(
schemas: &[(String, Vec<FrozenUnit>)],
wire_format: &str,
Expand Down
8 changes: 4 additions & 4 deletions codegen/src/facts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! Core computes them from the package's history (`comline_core::compat`),
//! which a generator never sees: it reads frozen IR only, without core's
//! compiler. These types mirror core's `PackageFacts`, field for field and
//! with the same JSON, so `comline generate` hands them over as they are.
//! with the same JSON, so `comline generation` hands them over as they are.
//!
//! **Numbers are never guessed.** A protocol that needs them and has none in
//! the facts is refused ([`check`]): falling back to its position would make
Expand Down Expand Up @@ -162,7 +162,7 @@ pub fn addressing(
facts.functions.iter().find(|ff| ff.name == *f).map(|ff| ff.number).ok_or_else(|| {
eyre!(
"protocol `{namespace}::{name}`, function `{f}`: the facts have no wire number for it, so they \
are older than the schema; run `comline build`, then generate again"
are older than the schema; run `comline build`, then run `comline generation` again"
)
})
})
Expand All @@ -181,7 +181,7 @@ fn missing(req_facts: Option<&PackageFacts>, namespace: &str, name: &str, parame
);
match req_facts {
None => eyre!(
"{why}, and the request carries no facts: `comline generate` supplies them from the package's build \
"{why}, and the request carries no facts: `comline generation` supplies them from the package's build \
history (run `comline build` first)"
),
Some(_) => eyre!(
Expand Down Expand Up @@ -305,7 +305,7 @@ pub struct HelloProtocol {
pub fn hello(req: &GenerateRequest, connection: &PackageConnection) -> Result<(Vec<u8>, Vec<HelloProtocol>)> {
let facts = req.facts.as_ref().ok_or_else(|| {
eyre!(
"the package's connection runs `comline@2`, and the request carries no facts: `comline generate` \
"the package's connection runs `comline@2`, and the request carries no facts: `comline generation` \
supplies them from the package's build history (run `comline build` first)"
)
})?;
Expand Down
2 changes: 1 addition & 1 deletion conformance/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ fn handshake_comline2() -> Fixture {
}

/// The facts a package's history would give `schemas` (`comline_core::compat`):
/// what `comline generate` supplies for a package that needs them. Here the
/// what `comline generation` supplies for a package that needs them. Here the
/// numbers run backwards from the declaration order, so a golden shows them
/// apart from positions; the hashes are fixed stand-ins.
pub fn facts_for(schemas: &[(String, Vec<FrozenUnit>)], wire_format: &str) -> comline_codegen::facts::PackageFacts {
Expand Down
2 changes: 1 addition & 1 deletion conformance/tests/conformance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ fn request_for(
validate_on_decode: options.validate_on_decode,
async_api: options.async_api,
encodings: comline_codegen::encodings::official_for(lang),
// Only a package that needs them gets facts, as from `comline generate`.
// Only a package that needs them gets facts, as from `comline generation`.
facts: comline_codegen::facts::needed(schemas, &comline_codegen::encodings::official_for(lang)).then(|| {
comline_conformance::facts_for(schemas, options.wire_format.as_deref().unwrap_or(DEFAULT_FORMAT))
}),
Expand Down
2 changes: 1 addition & 1 deletion schemas/comline-toml.json
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
"description": "Which package versions to generate bindings for: `latest` (the working tree, the default), `all` (every committed version), or one version or a list of them, each a version string or commit hash."
}
},
"description": "`comline.toml`: where `comline generate` writes code, and how. Which\nlanguages are generated comes from `config.idp`'s\n`code_generation.languages`; this file says where each one lands.",
"description": "`comline.toml`: where `comline generation` writes code, and how. Which\nlanguages are generated comes from `config.idp`'s\n`code_generation.languages`; this file says where each one lands.",
"properties": {
"doc": {
"allOf": [
Expand Down
Loading