user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

precommit test

Browse source
This commit is contained in:
klensy 2025-06-18 12:27:31 +03:00
parent c943f4c0e9
commit cc9d96cebc
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/ui/or_fun_call.fixed
View file

@ -283,6 +283,7 @@ mod issue8993 {
let _ = Some(4).map_or_else(g, f);
//~^ or_fun_call
let _ = Some(4).map_or(0, f);
let _ = Some(4).map_or("asd".to_string().len() as i32, f);
}
}
@ -426,6 +427,7 @@ mod result_map_or {
let _ = x.map_or_else(|_| g(), f);
//~^ or_fun_call
let _ = x.map_or(0, f);
let _ = x.map_or("asd".to_string().len() as i32, f);
}
}

2
tests/ui/or_fun_call.rs
View file

@ -283,6 +283,7 @@ mod issue8993 {
let _ = Some(4).map_or(g(), f);
//~^ or_fun_call
let _ = Some(4).map_or(0, f);
let _ = Some(4).map_or("asd".to_string().len() as i32, f);
}
}
@ -426,6 +427,7 @@ mod result_map_or {
let _ = x.map_or(g(), f);
//~^ or_fun_call
let _ = x.map_or(0, f);
let _ = x.map_or("asd".to_string().len() as i32, f);
}
}

36
tests/ui/or_fun_call.stderr
View file

@ -155,61 +155,61 @@ LL | let _ = Some(4).map_or(g(), f);
| ^^^^^^^^^^^^^^ help: try: `map_or_else(g, f)`
error: use of `unwrap_or_else` to construct default value
--> tests/ui/or_fun_call.rs:315:18
--> tests/ui/or_fun_call.rs:316:18
|
LL | with_new.unwrap_or_else(Vec::new);
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
error: use of `unwrap_or_else` to construct default value
--> tests/ui/or_fun_call.rs:319:28
--> tests/ui/or_fun_call.rs:320:28
|
LL | with_default_trait.unwrap_or_else(Default::default);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
error: use of `unwrap_or_else` to construct default value
--> tests/ui/or_fun_call.rs:323:27
--> tests/ui/or_fun_call.rs:324:27
|
LL | with_default_type.unwrap_or_else(u64::default);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
error: use of `unwrap_or_else` to construct default value
--> tests/ui/or_fun_call.rs:327:22
--> tests/ui/or_fun_call.rs:328:22
|
LL | real_default.unwrap_or_else(<FakeDefault as Default>::default);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
error: use of `or_insert_with` to construct default value
--> tests/ui/or_fun_call.rs:331:23
--> tests/ui/or_fun_call.rs:332:23
|
LL | map.entry(42).or_insert_with(String::new);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `or_default()`
error: use of `or_insert_with` to construct default value
--> tests/ui/or_fun_call.rs:335:25
--> tests/ui/or_fun_call.rs:336:25
|
LL | btree.entry(42).or_insert_with(String::new);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `or_default()`
error: use of `unwrap_or_else` to construct default value
--> tests/ui/or_fun_call.rs:339:25
--> tests/ui/or_fun_call.rs:340:25
|
LL | let _ = stringy.unwrap_or_else(String::new);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
error: function call inside of `unwrap_or`
--> tests/ui/or_fun_call.rs:381:17
--> tests/ui/or_fun_call.rs:382:17
|
LL | let _ = opt.unwrap_or({ f() }); // suggest `.unwrap_or_else(f)`
| ^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_else(f)`
error: function call inside of `unwrap_or`
--> tests/ui/or_fun_call.rs:386:17
--> tests/ui/or_fun_call.rs:387:17
|
LL | let _ = opt.unwrap_or(f() + 1); // suggest `.unwrap_or_else(|| f() + 1)`
| ^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_else(|| f() + 1)`
error: function call inside of `unwrap_or`
--> tests/ui/or_fun_call.rs:391:17
--> tests/ui/or_fun_call.rs:392:17
|
LL | let _ = opt.unwrap_or({
| _________________^
@ -229,49 +229,49 @@ LL ~ });
|
error: function call inside of `map_or`
--> tests/ui/or_fun_call.rs:397:17
--> tests/ui/or_fun_call.rs:398:17
|
LL | let _ = opt.map_or(f() + 1, |v| v); // suggest `.map_or_else(|| f() + 1, |v| v)`
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `map_or_else(|| f() + 1, |v| v)`
error: use of `unwrap_or` to construct default value
--> tests/ui/or_fun_call.rs:402:17
--> tests/ui/or_fun_call.rs:403:17
|
LL | let _ = opt.unwrap_or({ i32::default() });
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_default()`
error: function call inside of `unwrap_or`
--> tests/ui/or_fun_call.rs:409:21
--> tests/ui/or_fun_call.rs:410:21
|
LL | let _ = opt_foo.unwrap_or(Foo { val: String::default() });
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_else(|| Foo { val: String::default() })`
error: function call inside of `map_or`
--> tests/ui/or_fun_call.rs:424:19
--> tests/ui/or_fun_call.rs:425:19
|
LL | let _ = x.map_or(g(), |v| v);
| ^^^^^^^^^^^^^^^^^^ help: try: `map_or_else(|_| g(), |v| v)`
error: function call inside of `map_or`
--> tests/ui/or_fun_call.rs:426:19
--> tests/ui/or_fun_call.rs:427:19
|
LL | let _ = x.map_or(g(), f);
| ^^^^^^^^^^^^^^ help: try: `map_or_else(|_| g(), f)`
error: function call inside of `get_or_insert`
--> tests/ui/or_fun_call.rs:438:15
--> tests/ui/or_fun_call.rs:440:15
|
LL | let _ = x.get_or_insert(g());
| ^^^^^^^^^^^^^^^^^^ help: try: `get_or_insert_with(g)`
error: function call inside of `and`
--> tests/ui/or_fun_call.rs:448:15
--> tests/ui/or_fun_call.rs:450:15
|
LL | let _ = x.and(g());
| ^^^^^^^^ help: try: `and_then(|_| g())`
error: function call inside of `and`
--> tests/ui/or_fun_call.rs:458:15
--> tests/ui/or_fun_call.rs:460:15
|
LL | let _ = x.and(g());
| ^^^^^^^^ help: try: `and_then(|_| g())`