mirror of
https://github.com/zap-proto/rust.git
synced 2026-10-30 15:04:23 +00:00
Cap'n Proto was the canonical name for this Rust implementation. The
ZAP rebrand had only been applied as a directory rename so far —
crate names, schema file extensions, import paths, and binaries all
still said `capnp` / `capnpc`. This commit makes the rebrand real.
Workspace renames:
- crate capnp/ → zap/ (name = "zap")
- crate capnpc/ → zapc/ (name = "zapc")
- crate capnp-futures/ → zap-futures/
- crate capnp-rpc/ → zap-rpc/
Source-file renames:
- *_capnp.rs → *_zap.rs (~12 files: schema_zap.rs, rpc_zap.rs, etc.)
- capnpc-rust.rs → zapc-rust.rs (the codegen binary entry point)
- *.capnp → *.zap (33 schema files)
Identifier renames across the workspace (96 files rewritten):
- `use capnp::` → `use zap::`
- `extern crate capnp` → `extern crate zap`
- `capnp::generated_code!` → `zap::generated_code!`
- `capnp::traits::Owned` → `zap::traits::Owned`
- `capnp::message::...` → `zap::message::...`
- `capnp::Error/Result` → `zap::Error/Result`
- `capnp::Word` → `zap::Word`
- `capnp::primitive_list` → `zap::primitive_list`
- `capnp::any_pointer` → `zap::any_pointer`
- (etc. — see python script in commit history for full list)
Cargo.toml dep keys:
- `capnp = { path = ... }` → `zap = { path = ... }`
- `[dependencies.capnp]` → `[dependencies.zap]`
- `capnpc = { ... }` → `zapc = { ... }`
- Per-crate name= field and bin = "capnpc-rust" → "zapc"
Schema header strip:
- `using Cxx = import "/capnp/c++.capnp";` lines removed (C++ binding
hints; Rust output doesn't need them, and they referenced a system
/usr/include path we don't ship)
- `$Cxx.namespace("capnp::...")` annotations removed
Build-time decoupling for the benchmark:
- Pre-generated `carsales_zap.rs`, `catrank_zap.rs`, `eval_zap.rs` are
now committed in benchmark/. benchmark/build.rs just copies them
into OUT_DIR instead of invoking the schema compiler at build time.
- benchmark/Cargo.toml drops the [build-dependencies] zapc entry.
Building the benchmark needs ONLY the `zap` runtime crate; no
schema-compiler binary, no plugin, no shell-out.
To regenerate the schema-bound .rs from .zap (developer-only step):
cargo build --release --bin zapc
ln -sf zapc target/release/capnpc-rust # plugin discovery name
cd benchmark && PATH=../target/release:$PATH \
capnp compile -orust eval.zap catrank.zap carsales.zap
The `capnp` tool here is the upstream C++ schema-text parser — only
used as a parser frontend at codegen time, never linked into the
benchmark binary. Runtime + build = 100% zap/zapc only.
Verified by:
cargo tree -p benchmark --release → no capnp dep
grep -rE 'capnp|Capnp|CAPNP' . → 0 hits in active source
cargo build -p benchmark --release → clean build, no system tool
bash ./benchmark/bench.sh quick → runs end-to-end
Other workspace members (fill_random_values, addressbook,
wasm-hello-world, capnpc/test fixtures) still use build.rs schema
compilation at build time; they require a `zap` binary in PATH.
That's pre-existing — the upstream Cap'n Proto Rust workspace had the
same requirement against the `capnp` binary. Out of scope for this PR.
112 lines
3.9 KiB
Rust
112 lines
3.9 KiB
Rust
// Copyright (c) 2013-2014 Sandstorm Development Group, Inc. and contributors
|
|
// Licensed under the MIT License:
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to deal
|
|
// in the Software without restriction, including without limitation the rights
|
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
// copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
// THE SOFTWARE.
|
|
|
|
use crate::common::*;
|
|
use crate::eval_zap::{evaluation_result, expression, Operation};
|
|
|
|
fn make_expression(rng: &mut FastRand, mut exp: expression::Builder, depth: u32) -> i32 {
|
|
exp.set_op(
|
|
(rng.next_less_than(Operation::Modulus as u32 + 1) as u16)
|
|
.try_into()
|
|
.unwrap(),
|
|
);
|
|
|
|
let left: i32 = if rng.next_less_than(8) < depth {
|
|
let tmp = (rng.next_less_than(128) + 1) as i32;
|
|
exp.reborrow().get_left().set_value(tmp);
|
|
tmp
|
|
} else {
|
|
make_expression(rng, exp.reborrow().get_left().init_expression(), depth + 1)
|
|
};
|
|
|
|
let right: i32 = if rng.next_less_than(8) < depth {
|
|
let tmp = (rng.next_less_than(128) + 1) as i32;
|
|
exp.reborrow().get_right().set_value(tmp);
|
|
tmp
|
|
} else {
|
|
make_expression(rng, exp.reborrow().get_right().init_expression(), depth + 1)
|
|
};
|
|
|
|
match exp.get_op().unwrap() {
|
|
Operation::Add => left + right,
|
|
Operation::Subtract => left - right,
|
|
Operation::Multiply => left * right,
|
|
Operation::Divide => div(left, right),
|
|
Operation::Modulus => modulus(left, right),
|
|
}
|
|
}
|
|
|
|
fn evaluate_expression(exp: expression::Reader) -> ::zap::Result<i32> {
|
|
let left = match exp.get_left().which()? {
|
|
expression::left::Value(v) => v,
|
|
expression::left::Expression(e) => evaluate_expression(e?)?,
|
|
};
|
|
let right = match exp.get_right().which()? {
|
|
expression::right::Value(v) => v,
|
|
expression::right::Expression(e) => evaluate_expression(e?)?,
|
|
};
|
|
|
|
match exp.get_op()? {
|
|
Operation::Add => Ok(left + right),
|
|
Operation::Subtract => Ok(left - right),
|
|
Operation::Multiply => Ok(left * right),
|
|
Operation::Divide => Ok(div(left, right)),
|
|
Operation::Modulus => Ok(modulus(left, right)),
|
|
}
|
|
}
|
|
|
|
pub struct Eval;
|
|
|
|
impl crate::TestCase for Eval {
|
|
type Request = expression::Owned;
|
|
type Response = evaluation_result::Owned;
|
|
type Expectation = i32;
|
|
|
|
fn setup_request(&self, rng: &mut FastRand, request: expression::Builder) -> i32 {
|
|
make_expression(rng, request, 0)
|
|
}
|
|
|
|
fn handle_request(
|
|
&self,
|
|
request: expression::Reader,
|
|
mut response: evaluation_result::Builder,
|
|
) -> ::zap::Result<()> {
|
|
response.set_value(evaluate_expression(request)?);
|
|
Ok(())
|
|
}
|
|
|
|
fn check_response(
|
|
&self,
|
|
response: evaluation_result::Reader,
|
|
expected: i32,
|
|
) -> ::zap::Result<()> {
|
|
if response.get_value() == expected {
|
|
Ok(())
|
|
} else {
|
|
Err(::zap::Error::failed(format!(
|
|
"check_response() expected {} but got {}",
|
|
expected,
|
|
response.get_value()
|
|
)))
|
|
}
|
|
}
|
|
}
|