chore: apply clang-format to existing sources that drifted#84
Merged
Conversation
Eight tracked sources had accumulated format drift relative to .clang-format (Google style, 120-col, InsertBraces: true). Output of running pre-commit's clang-format hook over each. No behavior change. Files touched: - data_load_mcap/mcap_source.cpp - data_stream_ros2/distro/src/data_stream_ros2.cpp - data_stream_ros2/distro/src/ros2_dialog.hpp - data_stream_ros2/distro/src/ros2_qos_adapter.hpp - data_stream_ros2/distro/src/ros2_schema_builder.hpp - data_stream_ros2/proxy/src/data_stream_ros2.cpp - data_stream_zmq/zmq_dialog.hpp - toolbox_reactive_scripts_editor/reactive_script_editor.cpp
pabloinigoblasco
added a commit
that referenced
this pull request
May 12, 2026
…allback Resolves format conflicts from PR #84 (chore: apply clang-format). The reactive_script_editor.cpp conflicts all sit on lines where PR #83 wraps Python-specific code in #ifdef PJ_REACTIVE_HAS_PYTHON; resolved by keeping PR #83's semantic version (the whole point of the PR) and relying on the prior chore commit to align everything else with main's formatting.
pabloinigoblasco
added a commit
that referenced
this pull request
May 12, 2026
Resolves conflicts from PR #84 (chore: apply clang-format) landing on main. The only conflicting file was data_load_mcap/mcap_source.cpp; all three hunks were lines where this PR introduces the canonical- object pipeline: - reader_keeper_.reset() vs reader.close() on summary-read failure. PR keeps the keeper so the deferred fetcher cannot outlive a closed reader; resolved by taking PR's version. - early-exit on ensureParserBinding error vs old branching shape. PR's continue-on-error form is what the rest of the loop expects (the bindings.emplace below runs only on the success path). - runtimeHost().pushMessage(binding, ts, fetcher) vs the older pushRawMessage(binding, ts, span). PR's fetcher-closure path is the whole point of the canonical-object pipeline. Each conflict resolved by taking the PR side (HEAD); no semantic loss.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Eight tracked sources had accumulated format drift relative to
.clang-format(Google style, 120-col,InsertBraces: true). This PR re-applies clang-format over them — output of runningpre-commit run --files <those files>against the current tip ofmain.No behavior change. Compile output is identical (only whitespace, line wrapping, brace insertion).
Files touched
data_load_mcap/mcap_source.cppdata_stream_ros2/distro/src/data_stream_ros2.cppdata_stream_ros2/distro/src/ros2_dialog.hppdata_stream_ros2/distro/src/ros2_qos_adapter.hppdata_stream_ros2/distro/src/ros2_schema_builder.hppdata_stream_ros2/proxy/src/data_stream_ros2.cppdata_stream_zmq/zmq_dialog.hpptoolbox_reactive_scripts_editor/reactive_script_editor.cppConflict risk
Other open PRs touch some of these files:
fix/reactive-scripts-editor-disable-python-fallback) touchestoolbox_reactive_scripts_editor/reactive_script_editor.cpp.feat/mcap-source-object-store-lazy) touchesdata_load_mcap/mcap_source.cpp.Reviewers may want to land this after those merge (or rebase those onto this) to avoid messy whitespace-only conflicts.
Test plan
pre-commit run --files <8 files>is clean.