@@ -30,12 +30,14 @@ impl Range {
3030
3131 /// Start of the range.
3232 #[inline]
33+ #[must_use]
3334 pub fn from(&self) -> usize {
3435 std::cmp::min(self.anchor, self.head)
3536 }
3637
3738 /// End of the range.
3839 #[inline]
40+ #[must_use]
3941 pub fn to(&self) -> usize {
4042 std::cmp::max(self.anchor, self.head)
4143 }
@@ -47,6 +49,7 @@ impl Range {
4749 }
4850
4951 /// Check two ranges for overlap.
52+ #[must_use]
5053 pub fn overlaps(&self, other: &Self) -> bool {
5154 // cursor overlap is checked differently
5255 if self.is_empty() {
@@ -59,6 +62,7 @@ impl Range {
5962 // TODO: map
6063
6164 /// Extend the range to cover at least `from` `to`.
65+ #[must_use]
6266 pub fn extend(&self, from: usize, to: usize) -> Self {
6367 if from <= self.anchor && to >= self.anchor {
6468 return Range {
@@ -90,12 +94,14 @@ pub struct Selection {
9094impl Selection {
9195 // map
9296 // eq
97+
98+ #[must_use]
9399 pub fn primary(&self) -> Range {
94100 self.ranges[self.primary_index]
95101 }
96102
97103 /// Ensure selection containing only the primary selection.
98− pub fn as_single(self) -> Self {
104+ pub fn into_single(self) -> Self {
99105 if self.ranges.len() == 1 {
100106 self
101107 } else {
@@ -109,6 +115,7 @@ impl Selection {
109115 // add_range // push
110116 // replace_range
111117
118+ #[must_use]
112119 /// Constructs a selection holding a single range.
113120 pub fn single(anchor: usize, head: usize) -> Self {
114121 Self {
@@ -117,11 +124,12 @@ impl Selection {
117124 }
118125 }
119126
127+ #[must_use]
120128 pub fn new(ranges: SmallVec<[Range; 1]>, primary_index: usize) -> Self {
121− fn normalize(mut ranges: SmallVec<[Range; 1]>, primary_index: usize) -> Selection {
129+ fn normalize(mut ranges: SmallVec<[Range; 1]>, mut primary_index: usize) -> Selection {
122130 let primary = ranges[primary_index];
123− ranges.sort_unstable_by_key(|range| range.from());
124− let mut primary_index = ranges.iter().position(|&range| range == primary).unwrap();
131+ ranges.sort_unstable_by_key(Range::from);
132+ primary_index = ranges.iter().position(|&range| range == primary).unwrap();
125133
126134 let mut result: SmallVec<[Range; 1]> = SmallVec::new();
127135