Skip to content

Commit 9677c99

Browse files
authored
Merge branch 'main' into u/schgoo/wing
2 parents fef891a + 0f5a87c commit 9677c99

49 files changed

Lines changed: 1636 additions & 187 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cargo/config.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# enable use of modern CPU features on Linux for the benefit of our benchmarks
2+
[target.x86_64-unknown-linux-gnu]
3+
rustflags = ["-C", "target-cpu=x86-64-v3"]
4+
5+
# enable use of modern CPU features on Windows for the benefit of our benchmarks
6+
[target.x86_64-pc-windows-msvc]
7+
rustflags = ["-C", "target-cpu=x86-64-v3"]

.spelling

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
2+
298
23
0.X.Y
34
100k
45
10k
@@ -14,8 +15,8 @@ allocator
1415
Ani
1516
api
1617
APIs
18+
AppError
1719
appender
18-
Cargo.toml
1920
args
2021
AspNet
2122
async
@@ -38,6 +39,7 @@ buildable
3839
bytesbuf
3940
callee
4041
cancelled
42+
Cargo.toml
4143
C-BITFLAG
4244
C-CONV
4345
C-CONV-SPECIFIC
@@ -66,6 +68,7 @@ codebase
6668
codebases
6769
composability
6870
composable
71+
combinators
6972
config
7073
const
7174
contoso

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ repository = "https://github.com/microsoft/oxidizer"
2525

2626
# local dependencies
2727
arty = { path = "crates/arty", default-features = false, version = "0.1.0" }
28-
bytesbuf = { path = "crates/bytesbuf", default-features = false, version = "0.2.1" }
28+
bytesbuf = { path = "crates/bytesbuf", default-features = false, version = "0.2.2" }
2929
bytesbuf_io = { path = "crates/bytesbuf_io", default-features = false, version = "0.1.1" }
30-
data_privacy = { path = "crates/data_privacy", default-features = false, version = "0.10.0" }
30+
data_privacy = { path = "crates/data_privacy", default-features = false, version = "0.10.1" }
3131
data_privacy_macros = { path = "crates/data_privacy_macros", default-features = false, version = "0.9.0" }
3232
data_privacy_macros_impl = { path = "crates/data_privacy_macros_impl", default-features = false, version = "0.9.0" }
3333
fundle = { path = "crates/fundle", default-features = false, version = "0.3.0" }

DEVELOPMENT.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,15 @@ Validate the setup by executing the following tasks from the task palette (F1):
111111
1. `Tasks: Run Test Task`
112112

113113
Validate that debugging works by opening `crates/tick/examples/basic.rs` and pressing the `Debug` link that appears above `main()`. This should successfully launch the example app under the debugger.
114+
115+
# Before submitting a pull request
116+
117+
Run all essential CI checks locally with a single command:
118+
119+
```sh
120+
just check-changes
121+
```
122+
123+
This runs build, tests, clippy, formatting, and other validations in sequence—inspect the `justfile` for the full list of checks. Some checks (e.g., mutation testing) take too long to run locally; review the GitHub pipeline results to address those.
124+
125+
PR titles must follow [Conventional Commits](https://www.conventionalcommits.org/) format (e.g., `feat: add validation method`, `fix: resolve memory leak`).

codecov.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ coverage:
99
threshold: "0"
1010
base: auto
1111
ignore:
12-
- "crates/testing_aids/**/*"
12+
- "crates/testing_aids/**/*"
13+
# this is a temporary fix, for some reason codecov ignores cfg option in the file itself
14+
- "crates/ohno/src/test_util.rs"

crates/automation/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ repository.workspace = true
1414
publish = false
1515

1616
[dependencies]
17-
anyhow = { workspace = true, features = ["std"] }
17+
ohno = { workspace = true, features = ["app-err"] }
18+
1819
duct = { workspace = true }
1920
serde = { workspace = true, features = ["derive", "alloc"] }
2021
serde_json = { workspace = true, features = ["std"] }

crates/automation/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use std::path::Path;
1111
use std::process::Command;
1212

13-
use anyhow::{Context, Result};
13+
use ohno::{AppError, IntoAppError};
1414
use serde::Deserialize;
1515

1616
#[derive(Debug, Deserialize)]
@@ -41,21 +41,21 @@ pub struct Target {
4141
}
4242

4343
/// List all workspace packages using `cargo metadata`
44-
pub fn list_packages(workspace_root: impl AsRef<Path>) -> Result<Vec<PackageMetadata>> {
44+
pub fn list_packages(workspace_root: impl AsRef<Path>) -> Result<Vec<PackageMetadata>, AppError> {
4545
let output = Command::new("cargo")
4646
.arg("metadata")
4747
.arg("--format-version=1")
4848
.arg("--no-deps")
4949
.current_dir(workspace_root.as_ref())
5050
.output()
51-
.context("failed to execute cargo metadata")?;
51+
.into_app_err("failed to execute cargo metadata")?;
5252

5353
if !output.status.success() {
5454
let stderr = String::from_utf8_lossy(&output.stderr);
55-
anyhow::bail!("cargo metadata failed: {stderr}");
55+
ohno::bail!("cargo metadata failed: {stderr}");
5656
}
5757

58-
let metadata: CargoMetadata = serde_json::from_slice(&output.stdout).context("failed to parse cargo metadata output")?;
58+
let metadata: CargoMetadata = serde_json::from_slice(&output.stdout).into_app_err("failed to parse cargo metadata output")?;
5959

6060
Ok(metadata.packages)
6161
}
@@ -64,7 +64,7 @@ pub fn list_packages(workspace_root: impl AsRef<Path>) -> Result<Vec<PackageMeta
6464
pub const INTERNAL_CRATES: &[&str] = &["automation", "testing_aids"];
6565

6666
/// Run a cargo command and pipe the output to stdout/stderr
67-
pub fn run_cargo(args: impl Iterator<Item = impl AsRef<str>>) -> Result<()> {
67+
pub fn run_cargo(args: impl Iterator<Item = impl AsRef<str>>) -> Result<(), AppError> {
6868
let args: Vec<_> = args.map(|s| s.as_ref().to_string()).collect();
6969
let args_str = args.join(" ");
7070

@@ -75,7 +75,7 @@ pub fn run_cargo(args: impl Iterator<Item = impl AsRef<str>>) -> Result<()> {
7575
if !output.status.success() {
7676
let stderr = String::from_utf8_lossy(&output.stderr);
7777
let stdout = String::from_utf8_lossy(&output.stdout);
78-
anyhow::bail!(
78+
ohno::bail!(
7979
"cargo {} failed with exit code {:?}\nstdout: {}\nstderr: {}",
8080
args_str,
8181
output.status.code(),

crates/bytesbuf/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
- Replace removed doc_auto_cfg feature with doc_cfg ([#178](https://github.com/microsoft/oxidizer/pull/178))
1212

13+
- ✔️ Tasks
14+
15+
- Bump bytesbuf and bytesbuf_io version numbers to re-trigger publishing ([#188](https://github.com/microsoft/oxidizer/pull/188))
16+
1317
## [0.2.0] - 2026-01-02
1418

1519
- ✨ Features

crates/bytesbuf/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[package]
55
name = "bytesbuf"
66
description = "Types for creating and manipulating byte sequences."
7-
version = "0.2.1"
7+
version = "0.2.2"
88
readme = "README.md"
99
keywords = ["oxidizer", "buffers", "io", "zero-copy"]
1010
categories = ["data-structures", "network-programming"]

0 commit comments

Comments
 (0)