MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rust: rbtree: remove unwrap in asserts

Browse Source 
Remove `unwrap` in asserts and replace it with `Option::Some`
matching. By doing it this way, the examples are more
descriptive, so it disambiguates the return type of
the `get(...)` and `next(...)`, because the `unwrap(...)`
can also be called on `Result`.

Signed-off-by: Daniel Sedlak <daniel@sedlak.dev>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Link: https://lore.kernel.org/r/20241123095033.41240-3-daniel@sedlak.dev
[ Reworded title slightly. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Daniel Sedlak 2024-11-23 10:50:29 +01:00 committed by Miguel Ojeda
parent 7eeb0e7a50
commit 3a51854482
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
rust/kernel/rbtree.rs
View File

@ -36,17 +36,17 @@ use core::{
/// ///
/// // Check the nodes we just inserted. /// // Check the nodes we just inserted.
/// { /// {
/// assert_eq!(tree.get(&10).unwrap(), &100); /// assert_eq!(tree.get(&10), Some(&100));
/// assert_eq!(tree.get(&20).unwrap(), &200); /// assert_eq!(tree.get(&20), Some(&200));
/// assert_eq!(tree.get(&30).unwrap(), &300); /// assert_eq!(tree.get(&30), Some(&300));
/// } /// }
/// ///
/// // Iterate over the nodes we just inserted. /// // Iterate over the nodes we just inserted.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&10, &100)); /// assert_eq!(iter.next(), Some((&10, &100)));
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert_eq!(iter.next().unwrap(), (&30, &300)); /// assert_eq!(iter.next(), Some((&30, &300)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///
@ -61,9 +61,9 @@ use core::{
/// // Check that the tree reflects the replacement. /// // Check that the tree reflects the replacement.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&10, &1000)); /// assert_eq!(iter.next(), Some((&10, &1000)));
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert_eq!(iter.next().unwrap(), (&30, &300)); /// assert_eq!(iter.next(), Some((&30, &300)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///
@ -73,9 +73,9 @@ use core::{
/// // Check that the tree reflects the update. /// // Check that the tree reflects the update.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&10, &1000)); /// assert_eq!(iter.next(), Some((&10, &1000)));
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert_eq!(iter.next().unwrap(), (&30, &3000)); /// assert_eq!(iter.next(), Some((&30, &3000)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///
@ -85,8 +85,8 @@ use core::{
/// // Check that the tree reflects the removal. /// // Check that the tree reflects the removal.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert_eq!(iter.next().unwrap(), (&30, &3000)); /// assert_eq!(iter.next(), Some((&30, &3000)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///
@ -128,20 +128,20 @@ use core::{
/// // Check the nodes we just inserted. /// // Check the nodes we just inserted.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&10, &100)); /// assert_eq!(iter.next(), Some((&10, &100)));
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert_eq!(iter.next().unwrap(), (&30, &300)); /// assert_eq!(iter.next(), Some((&30, &300)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///
/// // Remove a node, getting back ownership of it. /// // Remove a node, getting back ownership of it.
/// let existing = tree.remove(&30).unwrap(); /// let existing = tree.remove(&30);
/// ///
/// // Check that the tree reflects the removal. /// // Check that the tree reflects the removal.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&10, &100)); /// assert_eq!(iter.next(), Some((&10, &100)));
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///
@ -155,9 +155,9 @@ use core::{
/// // Check that the tree reflect the new insertion. /// // Check that the tree reflect the new insertion.
/// { /// {
/// let mut iter = tree.iter(); /// let mut iter = tree.iter();
/// assert_eq!(iter.next().unwrap(), (&10, &100)); /// assert_eq!(iter.next(), Some((&10, &100)));
/// assert_eq!(iter.next().unwrap(), (&15, &150)); /// assert_eq!(iter.next(), Some((&15, &150)));
/// assert_eq!(iter.next().unwrap(), (&20, &200)); /// assert_eq!(iter.next(), Some((&20, &200)));
/// assert!(iter.next().is_none()); /// assert!(iter.next().is_none());
/// } /// }
/// ///