Skip to content

Commit f1f5221

Browse files
wutchzoneojeda
authored andcommitted
rust: kernel: rbtree: remove unwrap in asserts
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 Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 4edc408 commit f1f5221

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

rust/kernel/rbtree.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ use core::{
3636
///
3737
/// // Check the nodes we just inserted.
3838
/// {
39-
/// assert_eq!(tree.get(&10).unwrap(), &100);
40-
/// assert_eq!(tree.get(&20).unwrap(), &200);
41-
/// assert_eq!(tree.get(&30).unwrap(), &300);
39+
/// assert_eq!(tree.get(&10), Some(&100));
40+
/// assert_eq!(tree.get(&20), Some(&200));
41+
/// assert_eq!(tree.get(&30), Some(&300));
4242
/// }
4343
///
4444
/// // Iterate over the nodes we just inserted.
4545
/// {
4646
/// let mut iter = tree.iter();
47-
/// assert_eq!(iter.next().unwrap(), (&10, &100));
48-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
49-
/// assert_eq!(iter.next().unwrap(), (&30, &300));
47+
/// assert_eq!(iter.next(), Some((&10, &100)));
48+
/// assert_eq!(iter.next(), Some((&20, &200)));
49+
/// assert_eq!(iter.next(), Some((&30, &300)));
5050
/// assert!(iter.next().is_none());
5151
/// }
5252
///
@@ -61,9 +61,9 @@ use core::{
6161
/// // Check that the tree reflects the replacement.
6262
/// {
6363
/// let mut iter = tree.iter();
64-
/// assert_eq!(iter.next().unwrap(), (&10, &1000));
65-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
66-
/// assert_eq!(iter.next().unwrap(), (&30, &300));
64+
/// assert_eq!(iter.next(), Some((&10, &1000)));
65+
/// assert_eq!(iter.next(), Some((&20, &200)));
66+
/// assert_eq!(iter.next(), Some((&30, &300)));
6767
/// assert!(iter.next().is_none());
6868
/// }
6969
///
@@ -73,9 +73,9 @@ use core::{
7373
/// // Check that the tree reflects the update.
7474
/// {
7575
/// let mut iter = tree.iter();
76-
/// assert_eq!(iter.next().unwrap(), (&10, &1000));
77-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
78-
/// assert_eq!(iter.next().unwrap(), (&30, &3000));
76+
/// assert_eq!(iter.next(), Some((&10, &1000)));
77+
/// assert_eq!(iter.next(), Some((&20, &200)));
78+
/// assert_eq!(iter.next(), Some((&30, &3000)));
7979
/// assert!(iter.next().is_none());
8080
/// }
8181
///
@@ -85,8 +85,8 @@ use core::{
8585
/// // Check that the tree reflects the removal.
8686
/// {
8787
/// let mut iter = tree.iter();
88-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
89-
/// assert_eq!(iter.next().unwrap(), (&30, &3000));
88+
/// assert_eq!(iter.next(), Some((&20, &200)));
89+
/// assert_eq!(iter.next(), Some((&30, &3000)));
9090
/// assert!(iter.next().is_none());
9191
/// }
9292
///
@@ -128,20 +128,20 @@ use core::{
128128
/// // Check the nodes we just inserted.
129129
/// {
130130
/// let mut iter = tree.iter();
131-
/// assert_eq!(iter.next().unwrap(), (&10, &100));
132-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
133-
/// assert_eq!(iter.next().unwrap(), (&30, &300));
131+
/// assert_eq!(iter.next(), Some((&10, &100)));
132+
/// assert_eq!(iter.next(), Some((&20, &200)));
133+
/// assert_eq!(iter.next(), Some((&30, &300)));
134134
/// assert!(iter.next().is_none());
135135
/// }
136136
///
137137
/// // Remove a node, getting back ownership of it.
138-
/// let existing = tree.remove(&30).unwrap();
138+
/// let existing = tree.remove(&30);
139139
///
140140
/// // Check that the tree reflects the removal.
141141
/// {
142142
/// let mut iter = tree.iter();
143-
/// assert_eq!(iter.next().unwrap(), (&10, &100));
144-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
143+
/// assert_eq!(iter.next(), Some((&10, &100)));
144+
/// assert_eq!(iter.next(), Some((&20, &200)));
145145
/// assert!(iter.next().is_none());
146146
/// }
147147
///
@@ -155,9 +155,9 @@ use core::{
155155
/// // Check that the tree reflect the new insertion.
156156
/// {
157157
/// let mut iter = tree.iter();
158-
/// assert_eq!(iter.next().unwrap(), (&10, &100));
159-
/// assert_eq!(iter.next().unwrap(), (&15, &150));
160-
/// assert_eq!(iter.next().unwrap(), (&20, &200));
158+
/// assert_eq!(iter.next(), Some((&10, &100)));
159+
/// assert_eq!(iter.next(), Some((&15, &150)));
160+
/// assert_eq!(iter.next(), Some((&20, &200)));
161161
/// assert!(iter.next().is_none());
162162
/// }
163163
///

0 commit comments

Comments
 (0)