proto becomes bxcore, the one shared crate (M5b task 00)
Done the way the owner asked and the spike mapped: the crate and the manifests renamed, then what the build reported fixed. Layers: 138 "proto unresolved" errors across 169 files; cargo fmt reordering imports; six fixture paths built as strings in brokerd's and bxctl's tests, which the compiler cannot see, and comments naming crates/proto/; the crate-dependency check and its self-test. One more the spike did not reach: a `\nproto =` key inside a printf format in the self-test, which a word-boundary replacement skips because `n` and `p` are both word characters. make gate: gate: ok, 944 tests; no new entry in /tmp. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
use std::collections::HashSet;
|
||||
|
||||
use proto::{DataClass, MemoryArgs, MemoryFile, Timestamp};
|
||||
use bxcore::{DataClass, MemoryArgs, MemoryFile, Timestamp};
|
||||
|
||||
use crate::check::check;
|
||||
use crate::entries;
|
||||
@@ -270,7 +270,7 @@ fn claim(
|
||||
fn consolidate(
|
||||
file: MemoryFile,
|
||||
before: &[String],
|
||||
lines: &[proto::ConsolidateEntry],
|
||||
lines: &[bxcore::ConsolidateEntry],
|
||||
ctx: &Context,
|
||||
) -> Result<(Vec<String>, Vec<Note>), String> {
|
||||
let mut named: HashSet<usize> = HashSet::new();
|
||||
@@ -279,23 +279,23 @@ fn consolidate(
|
||||
for line in lines {
|
||||
let action = line.action().map_err(|e| e.to_string())?;
|
||||
match action {
|
||||
proto::EntryAction::Keep(old) => {
|
||||
bxcore::EntryAction::Keep(old) => {
|
||||
claim(file, before, &mut named, &old)?;
|
||||
after.push(old.trim().to_string());
|
||||
}
|
||||
proto::EntryAction::Rewrite { old, text } => {
|
||||
bxcore::EntryAction::Rewrite { old, text } => {
|
||||
claim(file, before, &mut named, &old)?;
|
||||
after.push(checked(&text)?);
|
||||
}
|
||||
proto::EntryAction::Move(old) => {
|
||||
bxcore::EntryAction::Move(old) => {
|
||||
claim(file, before, &mut named, &old)?;
|
||||
out.push(note(ctx, Kind::Moved(file), old.trim()));
|
||||
}
|
||||
proto::EntryAction::Drop(old) => {
|
||||
bxcore::EntryAction::Drop(old) => {
|
||||
claim(file, before, &mut named, &old)?;
|
||||
out.push(note(ctx, Kind::Dropped(file), old.trim()));
|
||||
}
|
||||
proto::EntryAction::New(text) => {
|
||||
bxcore::EntryAction::New(text) => {
|
||||
after.push(checked(&text)?);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user