Skip to content

Merge upstream/main into ours (2026-10-16) - #1

Merged
iannitram merged 4 commits into
oursfrom
merge/upstream-2026-10-16
Oct 16, 2026
Merged

iannitram merged 4 commits into
oursfrom
merge/upstream-2026-10-16

Conversation

@iannitram

Copy link
Copy Markdown
Owner

Merges upstream/main (storytold/lightcraft) into ours. Merge commit, no conflicts; 2 upstream commits come in. origin/main is an ancestor of this branch, so main can fast-forward later.

Checks, run on this commit on Windows (rustc/clippy 1.95), through the dev gate:

  • cargo fmt --check, cargo xtask layers, cargo xtask wasm: pass.
  • cargo test --workspace: two lib targets fail (lightcraft-engine: tests_export::same_folder_as_original_exports_next_to_each_photo and the tests_folder_drop tests; lightcraft-ui-egui: tests_folder_drop and tests_model_setup). The same tests fail on plain upstream/main f34c7a8, so they are upstream's or this Windows machine's, not from this merge.
  • cargo clippy --workspace --all-targets -D warnings: the findings are all in files byte-identical to upstream/main (old-toolchain lints), none in files this merge or our branch changes.

🤖 Generated with Claude Code

@iannitram
iannitram merged commit e6fd500 into ours Oct 16, 2026
2 checks passed
@iannitram
iannitram deleted the merge/upstream-2026-10-16 branch October 18, 2026 16:30
iannitram added a commit that referenced this pull request Oct 18, 2026
Merge upstream/main into ours (2026-10-16)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants