Skip to content

v2.2: Fix - Reformulates code comment in natural language (backport of #6337)#6405

Merged
Lichtso merged 1 commit into
v2.2from
mergify/bp/v2.2/pr-6337
Jun 11, 2025
Merged

v2.2: Fix - Reformulates code comment in natural language (backport of #6337)#6405
Lichtso merged 1 commit into
v2.2from
mergify/bp/v2.2/pr-6337

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Jun 4, 2025

Problem

See #6217 (comment).

Summary of Changes

Reformulates the code comment in question as natural language.


This is an automatic backport of pull request #6337 done by Mergify.

@mergify mergify Bot added the conflicts label Jun 4, 2025
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Jun 4, 2025

Cherry-pick of 0c1d60d has failed:

On branch mergify/bp/v2.2/pr-6337
Your branch is up to date with 'origin/v2.2'.

You are currently cherry-picking commit 0c1d60ddd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/lib.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot assigned Lichtso Jun 4, 2025
@mergify mergify Bot requested a review from a team as a code owner June 4, 2025 06:52
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Jun 4, 2025

The Firedancer team maintains a line-for-line reimplementation of the
native programs, and until native programs are moved to BPF, those
implementations must exactly match their Agave counterparts.
If this PR represents a change to a native program implementation (not
tests), please include a reviewer from the Firedancer team. And please
keep refactors to a minimum.

@Lichtso Lichtso force-pushed the mergify/bp/v2.2/pr-6337 branch from 6f30816 to 24eb1df Compare June 6, 2025 08:45
@Lichtso Lichtso removed the conflicts label Jun 6, 2025
@Lichtso Lichtso requested a review from buffalojoec June 6, 2025 08:46
@Lichtso Lichtso force-pushed the mergify/bp/v2.2/pr-6337 branch from 24eb1df to 1f763a4 Compare June 6, 2025 08:52
@t-nelson
Copy link
Copy Markdown

@mergify rebase

Reformulates code comment in natural language.

(cherry picked from commit 0c1d60d)
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Jun 10, 2025

rebase

✅ Branch has been successfully rebased

@t-nelson t-nelson force-pushed the mergify/bp/v2.2/pr-6337 branch from 1f763a4 to f8e49dd Compare June 10, 2025 19:27
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.4%. Comparing base (dcefe62) to head (f8e49dd).
Report is 2 commits behind head on v2.2.

Additional details and impacted files
@@           Coverage Diff           @@
##             v2.2    #6405   +/-   ##
=======================================
  Coverage    83.3%    83.4%           
=======================================
  Files         807      807           
  Lines      373478   373478           
=======================================
+ Hits       311470   311492   +22     
+ Misses      62008    61986   -22     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Lichtso Lichtso merged commit 6fd30db into v2.2 Jun 11, 2025
46 checks passed
@Lichtso Lichtso deleted the mergify/bp/v2.2/pr-6337 branch June 11, 2025 09:04
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.

4 participants