keep knowledge of ongoing merges across merge pipelines #5633
Conversation
This file contains 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
trinity-1686a
commented
Jan 13, 2025
|
looks like this made |
fulmicoton
reviewed
Jan 22, 2025
|
|
||
| use census::{Inventory, TrackedObject as InventoredObject}; | ||
|
|
||
| pub type TrackedObject<T> = InventoredObject<RecordUnacknoledgedDrop<T>>; |
fulmicoton
reviewed
Jan 22, 2025
| } | ||
|
|
||
| impl<T> RecordUnacknoledgedDrop<T> { | ||
| pub fn acknoledge(&self) { |
fulmicoton
reviewed
Jan 22, 2025
| } | ||
|
|
||
| impl<T> RecordUnacknoledgedDrop<T> { | ||
| pub fn acknoledge(&self) { |
There was a problem hiding this comment.
Suggested change
| pub fn acknoledge(&self) { | |
| pub fn acknowledge_and_drop(self) { |
fulmicoton
reviewed
Jan 22, 2025
| pub type TrackedObject<T> = InventoredObject<RecordUnacknoledgedDrop<T>>; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct Tracker<T> { |
There was a problem hiding this comment.
This struct needs a comment explaining its point.
fulmicoton
reviewed
Jan 22, 2025
| let (sender, _receiver) = channel(); | ||
| RecordUnacknoledgedDrop { | ||
| inner: MaybeUninit::new(value), | ||
| acknoledged: true.into(), |
There was a problem hiding this comment.
nitpick... (this helps the reader)
Suggested change
| acknoledged: true.into(), | |
| acknoledged: AtomicBool::from(true), |
fulmicoton
reviewed
Jan 22, 2025
| /// Return whether it is safe to recreate this tracker. | ||
| /// | ||
| /// A tracker is considered safe to recreate if this is the only instance left, | ||
| /// and it conaints no alive object (it may contain dead objects though). |
There was a problem hiding this comment.
Suggested change
| /// and it conaints no alive object (it may contain dead objects though). | |
| /// and it contains no alive object (it may contain dead objects though). |
fulmicoton
requested changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
fix #5588
How was this PR tested?
added a test reproducing what was failing before, and making sure it passes now