Add multiline case for test against map(f).unwrap_or(None)

tests/ui/methods.rs

@@ -108,8 +108,16 @@ fn option_methods() {
                .unwrap_or({
                     0
                 });
-    // map(f).unwrap_or(None) case
+    // single line `map(f).unwrap_or(None)` case
     let _ = opt.map(|x| Some(x + 1)).unwrap_or(None);
+    // multiline `map(f).unwrap_or(None)` cases
+    let _ = opt.map(|x| {
+        Some(x + 1)
+    }
+    ).unwrap_or(None);
+    let _ = opt
+        .map(|x| Some(x + 1))
+        .unwrap_or(None);
     // macro case
     let _ = opt_map!(opt, |x| x + 1).unwrap_or(0); // should not lint
 

tests/ui/methods.stderr

@@ -142,705 +142,726 @@ error: called `map(f).unwrap_or(None)` on an Option value. This can be done more
     |
     = note: replace `map(|x| Some(x + 1)).unwrap_or(None)` with `and_then(|x| Some(x + 1))`
 
-error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
+error: called `map(f).unwrap_or(None)` on an Option value. This can be done more directly by calling `and_then(f)` instead
+   --> $DIR/methods.rs:114:13
+    |
+114 |       let _ = opt.map(|x| {
+    |  _____________^
+115 | |         Some(x + 1)
+116 | |     }
+117 | |     ).unwrap_or(None);
+    | |_____________________^
+
+error: called `map(f).unwrap_or(None)` on an Option value. This can be done more directly by calling `and_then(f)` instead
    --> $DIR/methods.rs:118:13
     |
-118 |       let _ = opt.map(|x| x + 1)
+118 |       let _ = opt
     |  _____________^
-119 | |
+119 | |         .map(|x| Some(x + 1))
-120 | |                .unwrap_or_else(|| 0); // should lint even though this call is on a separate line
+120 | |         .unwrap_or(None);
-    | |____________________________________^
+    | |________________________^
     |
-    = note: `-D option-map-unwrap-or-else` implied by `-D warnings`
+    = note: replace `map(|x| Some(x + 1)).unwrap_or(None)` with `and_then(|x| Some(x + 1))`
-    = note: replace `map(|x| x + 1).unwrap_or_else(|| 0)` with `map_or_else(|| 0, |x| x + 1)`
-
-error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
-   --> $DIR/methods.rs:122:13
-    |
-122 |       let _ = opt.map(|x| {
-    |  _____________^
-123 | |                         x + 1
-124 | |                     }
-125 | |               ).unwrap_or_else(|| 0);
-    | |____________________________________^
 
 error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
    --> $DIR/methods.rs:126:13
     |
 126 |       let _ = opt.map(|x| x + 1)
     |  _____________^
-127 | |                .unwrap_or_else(||
+127 | |
-128 | |                     0
+128 | |                .unwrap_or_else(|| 0); // should lint even though this call is on a separate line
-129 | |                 );
+    | |____________________________________^
+    |
+    = note: `-D option-map-unwrap-or-else` implied by `-D warnings`
+    = note: replace `map(|x| x + 1).unwrap_or_else(|| 0)` with `map_or_else(|| 0, |x| x + 1)`
+
+error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
+   --> $DIR/methods.rs:130:13
+    |
+130 |       let _ = opt.map(|x| {
+    |  _____________^
+131 | |                         x + 1
+132 | |                     }
+133 | |               ).unwrap_or_else(|| 0);
+    | |____________________________________^
+
+error: called `map(f).unwrap_or_else(g)` on an Option value. This can be done more directly by calling `map_or_else(g, f)` instead
+   --> $DIR/methods.rs:134:13
+    |
+134 |       let _ = opt.map(|x| x + 1)
+    |  _____________^
+135 | |                .unwrap_or_else(||
+136 | |                     0
+137 | |                 );
     | |_________________^
 
 error: unnecessary structure name repetition
-   --> $DIR/methods.rs:155:24
+   --> $DIR/methods.rs:163:24
     |
-155 |     fn filter(self) -> IteratorFalsePositives {
+163 |     fn filter(self) -> IteratorFalsePositives {
     |                        ^^^^^^^^^^^^^^^^^^^^^^ help: use the applicable keyword: `Self`
 
 error: unnecessary structure name repetition
-   --> $DIR/methods.rs:159:22
+   --> $DIR/methods.rs:167:22
     |
-159 |     fn next(self) -> IteratorFalsePositives {
+167 |     fn next(self) -> IteratorFalsePositives {
     |                      ^^^^^^^^^^^^^^^^^^^^^^ help: use the applicable keyword: `Self`
 
 error: unnecessary structure name repetition
-   --> $DIR/methods.rs:179:32
+   --> $DIR/methods.rs:187:32
     |
-179 |     fn skip(self, _: usize) -> IteratorFalsePositives {
+187 |     fn skip(self, _: usize) -> IteratorFalsePositives {
     |                                ^^^^^^^^^^^^^^^^^^^^^^ help: use the applicable keyword: `Self`
 
 error: called `filter(p).next()` on an `Iterator`. This is more succinctly expressed by calling `.find(p)` instead.
-   --> $DIR/methods.rs:198:13
+   --> $DIR/methods.rs:206:13
     |
-198 |     let _ = v.iter().filter(|&x| *x < 0).next();
+206 |     let _ = v.iter().filter(|&x| *x < 0).next();
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D filter-next` implied by `-D warnings`
     = note: replace `filter(|&x| *x < 0).next()` with `find(|&x| *x < 0)`
 
 error: called `filter(p).next()` on an `Iterator`. This is more succinctly expressed by calling `.find(p)` instead.
-   --> $DIR/methods.rs:201:13
+   --> $DIR/methods.rs:209:13
     |
-201 |       let _ = v.iter().filter(|&x| {
+209 |       let _ = v.iter().filter(|&x| {
     |  _____________^
-202 | |                                 *x < 0
+210 | |                                 *x < 0
-203 | |                             }
+211 | |                             }
-204 | |                    ).next();
+212 | |                    ).next();
     | |___________________________^
 
 error: called `is_some()` after searching an `Iterator` with find. This is more succinctly expressed by calling `any()`.
-   --> $DIR/methods.rs:216:13
+   --> $DIR/methods.rs:224:13
     |
-216 |     let _ = v.iter().find(|&x| *x < 0).is_some();
+224 |     let _ = v.iter().find(|&x| *x < 0).is_some();
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D search-is-some` implied by `-D warnings`
     = note: replace `find(|&x| *x < 0).is_some()` with `any(|&x| *x < 0)`
 
 error: called `is_some()` after searching an `Iterator` with find. This is more succinctly expressed by calling `any()`.
-   --> $DIR/methods.rs:219:13
+   --> $DIR/methods.rs:227:13
     |
-219 |       let _ = v.iter().find(|&x| {
+227 |       let _ = v.iter().find(|&x| {
     |  _____________^
-220 | |                               *x < 0
+228 | |                               *x < 0
-221 | |                           }
+229 | |                           }
-222 | |                    ).is_some();
+230 | |                    ).is_some();
     | |______________________________^
 
 error: called `is_some()` after searching an `Iterator` with position. This is more succinctly expressed by calling `any()`.
-   --> $DIR/methods.rs:225:13
+   --> $DIR/methods.rs:233:13
     |
-225 |     let _ = v.iter().position(|&x| x < 0).is_some();
+233 |     let _ = v.iter().position(|&x| x < 0).is_some();
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: replace `position(|&x| x < 0).is_some()` with `any(|&x| x < 0)`
 
 error: called `is_some()` after searching an `Iterator` with position. This is more succinctly expressed by calling `any()`.
-   --> $DIR/methods.rs:228:13
+   --> $DIR/methods.rs:236:13
     |
-228 |       let _ = v.iter().position(|&x| {
+236 |       let _ = v.iter().position(|&x| {
     |  _____________^
-229 | |                                   x < 0
+237 | |                                   x < 0
-230 | |                               }
+238 | |                               }
-231 | |                    ).is_some();
+239 | |                    ).is_some();
     | |______________________________^
 
 error: called `is_some()` after searching an `Iterator` with rposition. This is more succinctly expressed by calling `any()`.
-   --> $DIR/methods.rs:234:13
+   --> $DIR/methods.rs:242:13
     |
-234 |     let _ = v.iter().rposition(|&x| x < 0).is_some();
+242 |     let _ = v.iter().rposition(|&x| x < 0).is_some();
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: replace `rposition(|&x| x < 0).is_some()` with `any(|&x| x < 0)`
 
 error: called `is_some()` after searching an `Iterator` with rposition. This is more succinctly expressed by calling `any()`.
-   --> $DIR/methods.rs:237:13
+   --> $DIR/methods.rs:245:13
     |
-237 |       let _ = v.iter().rposition(|&x| {
+245 |       let _ = v.iter().rposition(|&x| {
     |  _____________^
-238 | |                                    x < 0
+246 | |                                    x < 0
-239 | |                                }
+247 | |                                }
-240 | |                    ).is_some();
+248 | |                    ).is_some();
     | |______________________________^
 
 error: unnecessary structure name repetition
-   --> $DIR/methods.rs:254:21
+   --> $DIR/methods.rs:262:21
     |
-254 |         fn new() -> Foo { Foo }
+262 |         fn new() -> Foo { Foo }
     |                     ^^^ help: use the applicable keyword: `Self`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:272:5
+   --> $DIR/methods.rs:280:5
     |
-272 |     with_constructor.unwrap_or(make());
+280 |     with_constructor.unwrap_or(make());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_constructor.unwrap_or_else(make)`
     |
     = note: `-D or-fun-call` implied by `-D warnings`
 
 error: use of `unwrap_or` followed by a call to `new`
-   --> $DIR/methods.rs:275:5
+   --> $DIR/methods.rs:283:5
     |
-275 |     with_new.unwrap_or(Vec::new());
+283 |     with_new.unwrap_or(Vec::new());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_new.unwrap_or_default()`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:278:5
+   --> $DIR/methods.rs:286:5
     |
-278 |     with_const_args.unwrap_or(Vec::with_capacity(12));
+286 |     with_const_args.unwrap_or(Vec::with_capacity(12));
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_const_args.unwrap_or_else(|| Vec::with_capacity(12))`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:281:5
+   --> $DIR/methods.rs:289:5
     |
-281 |     with_err.unwrap_or(make());
+289 |     with_err.unwrap_or(make());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_err.unwrap_or_else(|_| make())`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:284:5
+   --> $DIR/methods.rs:292:5
     |
-284 |     with_err_args.unwrap_or(Vec::with_capacity(12));
+292 |     with_err_args.unwrap_or(Vec::with_capacity(12));
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_err_args.unwrap_or_else(|_| Vec::with_capacity(12))`
 
 error: use of `unwrap_or` followed by a call to `default`
-   --> $DIR/methods.rs:287:5
+   --> $DIR/methods.rs:295:5
     |
-287 |     with_default_trait.unwrap_or(Default::default());
+295 |     with_default_trait.unwrap_or(Default::default());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_default_trait.unwrap_or_default()`
 
 error: use of `unwrap_or` followed by a call to `default`
-   --> $DIR/methods.rs:290:5
+   --> $DIR/methods.rs:298:5
     |
-290 |     with_default_type.unwrap_or(u64::default());
+298 |     with_default_type.unwrap_or(u64::default());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_default_type.unwrap_or_default()`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:293:5
+   --> $DIR/methods.rs:301:5
     |
-293 |     with_vec.unwrap_or(vec![]);
+301 |     with_vec.unwrap_or(vec![]);
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `with_vec.unwrap_or_else(|| < [ _ ] > :: into_vec ( box [ $ ( $ x ) , * ] ))`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:298:5
+   --> $DIR/methods.rs:306:5
     |
-298 |     without_default.unwrap_or(Foo::new());
+306 |     without_default.unwrap_or(Foo::new());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `without_default.unwrap_or_else(Foo::new)`
 
 error: use of `or_insert` followed by a function call
-   --> $DIR/methods.rs:301:5
+   --> $DIR/methods.rs:309:5
     |
-301 |     map.entry(42).or_insert(String::new());
+309 |     map.entry(42).or_insert(String::new());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `map.entry(42).or_insert_with(String::new)`
 
 error: use of `or_insert` followed by a function call
-   --> $DIR/methods.rs:304:5
+   --> $DIR/methods.rs:312:5
     |
-304 |     btree.entry(42).or_insert(String::new());
+312 |     btree.entry(42).or_insert(String::new());
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `btree.entry(42).or_insert_with(String::new)`
 
 error: use of `unwrap_or` followed by a function call
-   --> $DIR/methods.rs:307:13
+   --> $DIR/methods.rs:315:13
     |
-307 |     let _ = stringy.unwrap_or("".to_owned());
+315 |     let _ = stringy.unwrap_or("".to_owned());
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `stringy.unwrap_or_else(|| "".to_owned())`
 
 error: called `.iter().nth()` on a Vec. Calling `.get()` is both faster and more readable
-   --> $DIR/methods.rs:318:23
+   --> $DIR/methods.rs:326:23
     |
-318 |         let bad_vec = some_vec.iter().nth(3);
+326 |         let bad_vec = some_vec.iter().nth(3);
     |                       ^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D iter-nth` implied by `-D warnings`
 
 error: called `.iter().nth()` on a slice. Calling `.get()` is both faster and more readable
-   --> $DIR/methods.rs:319:26
+   --> $DIR/methods.rs:327:26
     |
-319 |         let bad_slice = &some_vec[..].iter().nth(3);
+327 |         let bad_slice = &some_vec[..].iter().nth(3);
     |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `.iter().nth()` on a slice. Calling `.get()` is both faster and more readable
-   --> $DIR/methods.rs:320:31
+   --> $DIR/methods.rs:328:31
     |
-320 |         let bad_boxed_slice = boxed_slice.iter().nth(3);
+328 |         let bad_boxed_slice = boxed_slice.iter().nth(3);
     |                               ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `.iter().nth()` on a VecDeque. Calling `.get()` is both faster and more readable
-   --> $DIR/methods.rs:321:29
+   --> $DIR/methods.rs:329:29
     |
-321 |         let bad_vec_deque = some_vec_deque.iter().nth(3);
+329 |         let bad_vec_deque = some_vec_deque.iter().nth(3);
     |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `.iter_mut().nth()` on a Vec. Calling `.get_mut()` is both faster and more readable
-   --> $DIR/methods.rs:326:23
+   --> $DIR/methods.rs:334:23
     |
-326 |         let bad_vec = some_vec.iter_mut().nth(3);
+334 |         let bad_vec = some_vec.iter_mut().nth(3);
     |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `.iter_mut().nth()` on a slice. Calling `.get_mut()` is both faster and more readable
-   --> $DIR/methods.rs:329:26
+   --> $DIR/methods.rs:337:26
     |
-329 |         let bad_slice = &some_vec[..].iter_mut().nth(3);
+337 |         let bad_slice = &some_vec[..].iter_mut().nth(3);
     |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `.iter_mut().nth()` on a VecDeque. Calling `.get_mut()` is both faster and more readable
-   --> $DIR/methods.rs:332:29
+   --> $DIR/methods.rs:340:29
     |
-332 |         let bad_vec_deque = some_vec_deque.iter_mut().nth(3);
+340 |         let bad_vec_deque = some_vec_deque.iter_mut().nth(3);
     |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-   --> $DIR/methods.rs:344:13
+   --> $DIR/methods.rs:352:13
     |
-344 |     let _ = some_vec.iter().skip(42).next();
+352 |     let _ = some_vec.iter().skip(42).next();
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D iter-skip-next` implied by `-D warnings`
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-   --> $DIR/methods.rs:345:13
+   --> $DIR/methods.rs:353:13
     |
-345 |     let _ = some_vec.iter().cycle().skip(42).next();
+353 |     let _ = some_vec.iter().cycle().skip(42).next();
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-   --> $DIR/methods.rs:346:13
+   --> $DIR/methods.rs:354:13
     |
-346 |     let _ = (1..10).skip(10).next();
+354 |     let _ = (1..10).skip(10).next();
     |             ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-   --> $DIR/methods.rs:347:14
+   --> $DIR/methods.rs:355:14
     |
-347 |     let _ = &some_vec[..].iter().skip(3).next();
+355 |     let _ = &some_vec[..].iter().skip(3).next();
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `.get().unwrap()` on a slice. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:373:17
+   --> $DIR/methods.rs:381:17
     |
-373 |         let _ = boxed_slice.get(1).unwrap();
+381 |         let _ = boxed_slice.get(1).unwrap();
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&boxed_slice[1]`
     |
     = note: `-D get-unwrap` implied by `-D warnings`
 
 error: called `.get().unwrap()` on a slice. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:374:17
+   --> $DIR/methods.rs:382:17
     |
-374 |         let _ = some_slice.get(0).unwrap();
+382 |         let _ = some_slice.get(0).unwrap();
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&some_slice[0]`
 
 error: called `.get().unwrap()` on a Vec. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:375:17
+   --> $DIR/methods.rs:383:17
     |
-375 |         let _ = some_vec.get(0).unwrap();
+383 |         let _ = some_vec.get(0).unwrap();
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&some_vec[0]`
 
 error: called `.get().unwrap()` on a VecDeque. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:376:17
+   --> $DIR/methods.rs:384:17
     |
-376 |         let _ = some_vecdeque.get(0).unwrap();
+384 |         let _ = some_vecdeque.get(0).unwrap();
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&some_vecdeque[0]`
 
 error: called `.get().unwrap()` on a HashMap. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:377:17
+   --> $DIR/methods.rs:385:17
     |
-377 |         let _ = some_hashmap.get(&1).unwrap();
+385 |         let _ = some_hashmap.get(&1).unwrap();
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&some_hashmap[&1]`
 
 error: called `.get().unwrap()` on a BTreeMap. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:378:17
+   --> $DIR/methods.rs:386:17
     |
-378 |         let _ = some_btreemap.get(&1).unwrap();
+386 |         let _ = some_btreemap.get(&1).unwrap();
     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&some_btreemap[&1]`
 
 error: called `.get_mut().unwrap()` on a slice. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:383:10
+   --> $DIR/methods.rs:391:10
     |
-383 |         *boxed_slice.get_mut(0).unwrap() = 1;
+391 |         *boxed_slice.get_mut(0).unwrap() = 1;
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&mut boxed_slice[0]`
 
 error: called `.get_mut().unwrap()` on a slice. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:384:10
+   --> $DIR/methods.rs:392:10
     |
-384 |         *some_slice.get_mut(0).unwrap() = 1;
+392 |         *some_slice.get_mut(0).unwrap() = 1;
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&mut some_slice[0]`
 
 error: called `.get_mut().unwrap()` on a Vec. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:385:10
+   --> $DIR/methods.rs:393:10
     |
-385 |         *some_vec.get_mut(0).unwrap() = 1;
+393 |         *some_vec.get_mut(0).unwrap() = 1;
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&mut some_vec[0]`
 
 error: called `.get_mut().unwrap()` on a VecDeque. Using `[]` is more clear and more concise
-   --> $DIR/methods.rs:386:10
+   --> $DIR/methods.rs:394:10
     |
-386 |         *some_vecdeque.get_mut(0).unwrap() = 1;
+394 |         *some_vecdeque.get_mut(0).unwrap() = 1;
     |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&mut some_vecdeque[0]`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:400:13
+   --> $DIR/methods.rs:408:13
     |
-400 |     let _ = opt.unwrap();
+408 |     let _ = opt.unwrap();
     |             ^^^^^^^^^^^^
     |
     = note: `-D option-unwrap-used` implied by `-D warnings`
 
 error: used unwrap() on a Result value. If you don't want to handle the Err case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:403:13
+   --> $DIR/methods.rs:411:13
     |
-403 |     let _ = res.unwrap();
+411 |     let _ = res.unwrap();
     |             ^^^^^^^^^^^^
     |
     = note: `-D result-unwrap-used` implied by `-D warnings`
 
 error: called `ok().expect()` on a Result value. You can call `expect` directly on the `Result`
-   --> $DIR/methods.rs:405:5
+   --> $DIR/methods.rs:413:5
     |
-405 |     res.ok().expect("disaster!");
+413 |     res.ok().expect("disaster!");
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D ok-expect` implied by `-D warnings`
 
 error: called `ok().expect()` on a Result value. You can call `expect` directly on the `Result`
-   --> $DIR/methods.rs:411:5
+   --> $DIR/methods.rs:419:5
     |
-411 |     res3.ok().expect("whoof");
+419 |     res3.ok().expect("whoof");
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `ok().expect()` on a Result value. You can call `expect` directly on the `Result`
-   --> $DIR/methods.rs:413:5
+   --> $DIR/methods.rs:421:5
     |
-413 |     res4.ok().expect("argh");
+421 |     res4.ok().expect("argh");
     |     ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `ok().expect()` on a Result value. You can call `expect` directly on the `Result`
-   --> $DIR/methods.rs:415:5
+   --> $DIR/methods.rs:423:5
     |
-415 |     res5.ok().expect("oops");
+423 |     res5.ok().expect("oops");
     |     ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `ok().expect()` on a Result value. You can call `expect` directly on the `Result`
-   --> $DIR/methods.rs:417:5
+   --> $DIR/methods.rs:425:5
     |
-417 |     res6.ok().expect("meh");
+425 |     res6.ok().expect("meh");
     |     ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `starts_with` method
-   --> $DIR/methods.rs:429:5
+   --> $DIR/methods.rs:437:5
     |
-429 |     "".chars().next() == Some(' ');
+437 |     "".chars().next() == Some(' ');
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `"".starts_with(' ')`
     |
     = note: `-D chars-next-cmp` implied by `-D warnings`
 
 error: you should use the `starts_with` method
-   --> $DIR/methods.rs:430:5
+   --> $DIR/methods.rs:438:5
     |
-430 |     Some(' ') != "".chars().next();
+438 |     Some(' ') != "".chars().next();
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!"".starts_with(' ')`
 
 error: calling `.extend(_.chars())`
-   --> $DIR/methods.rs:439:5
+   --> $DIR/methods.rs:447:5
     |
-439 |     s.extend(abc.chars());
+447 |     s.extend(abc.chars());
     |     ^^^^^^^^^^^^^^^^^^^^^ help: try this: `s.push_str(abc)`
     |
     = note: `-D string-extend-chars` implied by `-D warnings`
 
 error: calling `.extend(_.chars())`
-   --> $DIR/methods.rs:442:5
+   --> $DIR/methods.rs:450:5
     |
-442 |     s.extend("abc".chars());
+450 |     s.extend("abc".chars());
     |     ^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `s.push_str("abc")`
 
 error: calling `.extend(_.chars())`
-   --> $DIR/methods.rs:445:5
+   --> $DIR/methods.rs:453:5
     |
-445 |     s.extend(def.chars());
+453 |     s.extend(def.chars());
     |     ^^^^^^^^^^^^^^^^^^^^^ help: try this: `s.push_str(&def)`
 
 error: using `clone` on a `Copy` type
-   --> $DIR/methods.rs:456:5
+   --> $DIR/methods.rs:464:5
     |
-456 |     42.clone();
+464 |     42.clone();
     |     ^^^^^^^^^^ help: try removing the `clone` call: `42`
     |
     = note: `-D clone-on-copy` implied by `-D warnings`
 
 error: using `clone` on a `Copy` type
-   --> $DIR/methods.rs:460:5
+   --> $DIR/methods.rs:468:5
     |
-460 |     (&42).clone();
+468 |     (&42).clone();
     |     ^^^^^^^^^^^^^ help: try dereferencing it: `*(&42)`
 
 error: using '.clone()' on a ref-counted pointer
-   --> $DIR/methods.rs:470:5
+   --> $DIR/methods.rs:478:5
     |
-470 |     rc.clone();
+478 |     rc.clone();
     |     ^^^^^^^^^^ help: try this: `Rc::clone(&rc)`
     |
     = note: `-D clone-on-ref-ptr` implied by `-D warnings`
 
 error: using '.clone()' on a ref-counted pointer
-   --> $DIR/methods.rs:473:5
+   --> $DIR/methods.rs:481:5
     |
-473 |     arc.clone();
+481 |     arc.clone();
     |     ^^^^^^^^^^^ help: try this: `Arc::clone(&arc)`
 
 error: using '.clone()' on a ref-counted pointer
-   --> $DIR/methods.rs:476:5
+   --> $DIR/methods.rs:484:5
     |
-476 |     rcweak.clone();
+484 |     rcweak.clone();
     |     ^^^^^^^^^^^^^^ help: try this: `Weak::clone(&rcweak)`
 
 error: using '.clone()' on a ref-counted pointer
-   --> $DIR/methods.rs:479:5
+   --> $DIR/methods.rs:487:5
     |
-479 |     arc_weak.clone();
+487 |     arc_weak.clone();
     |     ^^^^^^^^^^^^^^^^ help: try this: `Weak::clone(&arc_weak)`
 
 error: using `clone` on a `Copy` type
-   --> $DIR/methods.rs:486:5
+   --> $DIR/methods.rs:494:5
     |
-486 |     t.clone();
+494 |     t.clone();
     |     ^^^^^^^^^ help: try removing the `clone` call: `t`
 
 error: using `clone` on a `Copy` type
-   --> $DIR/methods.rs:488:5
+   --> $DIR/methods.rs:496:5
     |
-488 |     Some(t).clone();
+496 |     Some(t).clone();
     |     ^^^^^^^^^^^^^^^ help: try removing the `clone` call: `Some(t)`
 
 error: using `clone` on a double-reference; this will copy the reference instead of cloning the inner type
-   --> $DIR/methods.rs:494:22
+   --> $DIR/methods.rs:502:22
     |
-494 |     let z: &Vec<_> = y.clone();
+502 |     let z: &Vec<_> = y.clone();
     |                      ^^^^^^^^^ help: try dereferencing it: `(*y).clone()`
     |
     = note: `-D clone-double-ref` implied by `-D warnings`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:501:13
+   --> $DIR/methods.rs:509:13
     |
-501 |     x.split("x");
+509 |     x.split("x");
     |     --------^^^- help: try using a char instead: `x.split('x')`
     |
     = note: `-D single-char-pattern` implied by `-D warnings`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:518:16
+   --> $DIR/methods.rs:526:16
     |
-518 |     x.contains("x");
+526 |     x.contains("x");
     |     -----------^^^- help: try using a char instead: `x.contains('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:519:19
+   --> $DIR/methods.rs:527:19
     |
-519 |     x.starts_with("x");
+527 |     x.starts_with("x");
     |     --------------^^^- help: try using a char instead: `x.starts_with('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:520:17
+   --> $DIR/methods.rs:528:17
     |
-520 |     x.ends_with("x");
+528 |     x.ends_with("x");
     |     ------------^^^- help: try using a char instead: `x.ends_with('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:521:12
+   --> $DIR/methods.rs:529:12
     |
-521 |     x.find("x");
+529 |     x.find("x");
     |     -------^^^- help: try using a char instead: `x.find('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:522:13
+   --> $DIR/methods.rs:530:13
     |
-522 |     x.rfind("x");
+530 |     x.rfind("x");
     |     --------^^^- help: try using a char instead: `x.rfind('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:523:14
+   --> $DIR/methods.rs:531:14
     |
-523 |     x.rsplit("x");
+531 |     x.rsplit("x");
     |     ---------^^^- help: try using a char instead: `x.rsplit('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:524:24
+   --> $DIR/methods.rs:532:24
     |
-524 |     x.split_terminator("x");
+532 |     x.split_terminator("x");
     |     -------------------^^^- help: try using a char instead: `x.split_terminator('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:525:25
+   --> $DIR/methods.rs:533:25
     |
-525 |     x.rsplit_terminator("x");
+533 |     x.rsplit_terminator("x");
     |     --------------------^^^- help: try using a char instead: `x.rsplit_terminator('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:526:17
+   --> $DIR/methods.rs:534:17
     |
-526 |     x.splitn(0, "x");
+534 |     x.splitn(0, "x");
     |     ------------^^^- help: try using a char instead: `x.splitn(0, 'x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:527:18
+   --> $DIR/methods.rs:535:18
     |
-527 |     x.rsplitn(0, "x");
+535 |     x.rsplitn(0, "x");
     |     -------------^^^- help: try using a char instead: `x.rsplitn(0, 'x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:528:15
+   --> $DIR/methods.rs:536:15
     |
-528 |     x.matches("x");
+536 |     x.matches("x");
     |     ----------^^^- help: try using a char instead: `x.matches('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:529:16
+   --> $DIR/methods.rs:537:16
     |
-529 |     x.rmatches("x");
+537 |     x.rmatches("x");
     |     -----------^^^- help: try using a char instead: `x.rmatches('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:530:21
+   --> $DIR/methods.rs:538:21
     |
-530 |     x.match_indices("x");
+538 |     x.match_indices("x");
     |     ----------------^^^- help: try using a char instead: `x.match_indices('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:531:22
+   --> $DIR/methods.rs:539:22
     |
-531 |     x.rmatch_indices("x");
+539 |     x.rmatch_indices("x");
     |     -----------------^^^- help: try using a char instead: `x.rmatch_indices('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:532:25
+   --> $DIR/methods.rs:540:25
     |
-532 |     x.trim_left_matches("x");
+540 |     x.trim_left_matches("x");
     |     --------------------^^^- help: try using a char instead: `x.trim_left_matches('x')`
 
 error: single-character string constant used as pattern
-   --> $DIR/methods.rs:533:26
+   --> $DIR/methods.rs:541:26
     |
-533 |     x.trim_right_matches("x");
+541 |     x.trim_right_matches("x");
     |     ---------------------^^^- help: try using a char instead: `x.trim_right_matches('x')`
 
 error: you are getting the inner pointer of a temporary `CString`
-   --> $DIR/methods.rs:543:5
+   --> $DIR/methods.rs:551:5
     |
-543 |     CString::new("foo").unwrap().as_ptr();
+551 |     CString::new("foo").unwrap().as_ptr();
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D temporary-cstring-as-ptr` implied by `-D warnings`
     = note: that pointer will be invalid outside this expression
 help: assign the `CString` to a variable to extend its lifetime
-   --> $DIR/methods.rs:543:5
+   --> $DIR/methods.rs:551:5
     |
-543 |     CString::new("foo").unwrap().as_ptr();
+551 |     CString::new("foo").unwrap().as_ptr();
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `cloned().collect()` on a slice to create a `Vec`. Calling `to_vec()` is both faster and more readable
-   --> $DIR/methods.rs:548:27
+   --> $DIR/methods.rs:556:27
     |
-548 |     let v2 : Vec<isize> = v.iter().cloned().collect();
+556 |     let v2 : Vec<isize> = v.iter().cloned().collect();
     |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = note: `-D iter-cloned-collect` implied by `-D warnings`
 
 error: you should use the `starts_with` method
-   --> $DIR/methods.rs:555:8
+   --> $DIR/methods.rs:563:8
     |
-555 |     if s.chars().next().unwrap() == 'f' { // s.starts_with('f')
+563 |     if s.chars().next().unwrap() == 'f' { // s.starts_with('f')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `s.starts_with('f')`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:555:8
+   --> $DIR/methods.rs:563:8
     |
-555 |     if s.chars().next().unwrap() == 'f' { // s.starts_with('f')
+563 |     if s.chars().next().unwrap() == 'f' { // s.starts_with('f')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:558:8
+   --> $DIR/methods.rs:566:8
     |
-558 |     if s.chars().next_back().unwrap() == 'o' { // s.ends_with('o')
+566 |     if s.chars().next_back().unwrap() == 'o' { // s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `s.ends_with('o')`
     |
     = note: `-D chars-last-cmp` implied by `-D warnings`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:558:8
+   --> $DIR/methods.rs:566:8
     |
-558 |     if s.chars().next_back().unwrap() == 'o' { // s.ends_with('o')
+566 |     if s.chars().next_back().unwrap() == 'o' { // s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:561:8
+   --> $DIR/methods.rs:569:8
     |
-561 |     if s.chars().last().unwrap() == 'o' { // s.ends_with('o')
+569 |     if s.chars().last().unwrap() == 'o' { // s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `s.ends_with('o')`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:561:8
+   --> $DIR/methods.rs:569:8
     |
-561 |     if s.chars().last().unwrap() == 'o' { // s.ends_with('o')
+569 |     if s.chars().last().unwrap() == 'o' { // s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `starts_with` method
-   --> $DIR/methods.rs:564:8
+   --> $DIR/methods.rs:572:8
     |
-564 |     if s.chars().next().unwrap() != 'f' { // !s.starts_with('f')
+572 |     if s.chars().next().unwrap() != 'f' { // !s.starts_with('f')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!s.starts_with('f')`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:564:8
+   --> $DIR/methods.rs:572:8
     |
-564 |     if s.chars().next().unwrap() != 'f' { // !s.starts_with('f')
+572 |     if s.chars().next().unwrap() != 'f' { // !s.starts_with('f')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:567:8
+   --> $DIR/methods.rs:575:8
     |
-567 |     if s.chars().next_back().unwrap() != 'o' { // !s.ends_with('o')
+575 |     if s.chars().next_back().unwrap() != 'o' { // !s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!s.ends_with('o')`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:567:8
+   --> $DIR/methods.rs:575:8
     |
-567 |     if s.chars().next_back().unwrap() != 'o' { // !s.ends_with('o')
+575 |     if s.chars().next_back().unwrap() != 'o' { // !s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:570:8
+   --> $DIR/methods.rs:578:8
     |
-570 |     if s.chars().last().unwrap() != 'o' { // !s.ends_with('o')
+578 |     if s.chars().last().unwrap() != 'o' { // !s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!s.ends_with('o')`
 
 error: used unwrap() on an Option value. If you don't want to handle the None case gracefully, consider using expect() to provide a better panic message
-   --> $DIR/methods.rs:570:8
+   --> $DIR/methods.rs:578:8
     |
-570 |     if s.chars().last().unwrap() != 'o' { // !s.ends_with('o')
+578 |     if s.chars().last().unwrap() != 'o' { // !s.ends_with('o')
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:577:5
+   --> $DIR/methods.rs:585:5
     |
-577 |     "".chars().last() == Some(' ');
+585 |     "".chars().last() == Some(' ');
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `"".ends_with(' ')`
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:578:5
+   --> $DIR/methods.rs:586:5
     |
-578 |     Some(' ') != "".chars().last();
+586 |     Some(' ') != "".chars().last();
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!"".ends_with(' ')`
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:579:5
+   --> $DIR/methods.rs:587:5
     |
-579 |     "".chars().next_back() == Some(' ');
+587 |     "".chars().next_back() == Some(' ');
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `"".ends_with(' ')`
 
 error: you should use the `ends_with` method
-   --> $DIR/methods.rs:580:5
+   --> $DIR/methods.rs:588:5
     |
-580 |     Some(' ') != "".chars().next_back();
+588 |     Some(' ') != "".chars().next_back();
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!"".ends_with(' ')`