Skip to content

Commit 46cdce1

Browse files
ShoyuVanillaShoyuVanilla
committed
Update expectation tests
1 parent e36a31b commit 46cdce1

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎crates/hir-ty/src/tests/patterns.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -702,25 +702,25 @@ fn test() {
702702
51..58 'loop {}': !
703703
56..58 '{}': ()
704704
72..171 '{ ... x); }': ()
705-
78..81 'foo': fn foo<&(i32, &str), i32, impl Fn(&(i32, &str)) -> i32>(&(i32, &str), impl Fn(&(i32, &str)) -> i32) -> i32
705+
78..81 'foo': fn foo<&(i32, &str), i32, impl FnOnce(&(i32, &str)) -> i32>(&(i32, &str), impl FnOnce(&(i32, &str)) -> i32) -> i32
706706
78..105 'foo(&(...y)| x)': i32
707707
82..91 '&(1, "a")': &(i32, &str)
708708
83..91 '(1, "a")': (i32, &str)
709709
84..85 '1': i32
710710
87..90 '"a"': &str
711-
93..104 '|&(x, y)| x': impl Fn(&(i32, &str)) -> i32
711+
93..104 '|&(x, y)| x': impl FnOnce(&(i32, &str)) -> i32
712712
94..101 '&(x, y)': &(i32, &str)
713713
95..101 '(x, y)': (i32, &str)
714714
96..97 'x': i32
715715
99..100 'y': &str
716716
103..104 'x': i32
717-
142..145 'foo': fn foo<&(i32, &str), &i32, impl Fn(&(i32, &str)) -> &i32>(&(i32, &str), impl Fn(&(i32, &str)) -> &i32) -> &i32
717+
142..145 'foo': fn foo<&(i32, &str), &i32, impl FnOnce(&(i32, &str)) -> &i32>(&(i32, &str), impl FnOnce(&(i32, &str)) -> &i32) -> &i32
718718
142..168 'foo(&(...y)| x)': &i32
719719
146..155 '&(1, "a")': &(i32, &str)
720720
147..155 '(1, "a")': (i32, &str)
721721
148..149 '1': i32
722722
151..154 '"a"': &str
723-
157..167 '|(x, y)| x': impl Fn(&(i32, &str)) -> &i32
723+
157..167 '|(x, y)| x': impl FnOnce(&(i32, &str)) -> &i32
724724
158..164 '(x, y)': (i32, &str)
725725
159..160 'x': &i32
726726
162..163 'y': &&str

‎crates/hir-ty/src/tests/regression.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ fn main() {
862862
123..126 'S()': S<i32>
863863
132..133 's': S<i32>
864864
132..144 's.g(|_x| {})': ()
865-
136..143 '|_x| {}': impl Fn(&i32)
865+
136..143 '|_x| {}': impl FnOnce(&i32)
866866
137..139 '_x': &i32
867867
141..143 '{}': ()
868868
150..151 's': S<i32>

‎crates/hir-ty/src/tests/simple.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2190,9 +2190,9 @@ fn main() {
21902190
149..151 'Ok': extern "rust-call" Ok<(), ()>(()) -> Result<(), ()>
21912191
149..155 'Ok(())': Result<(), ()>
21922192
152..154 '()': ()
2193-
167..171 'test': fn test<(), (), impl Fn() -> impl Future<Output = Result<(), ()>>, impl Future<Output = Result<(), ()>>>(impl Fn() -> impl Future<Output = Result<(), ()>>)
2193+
167..171 'test': fn test<(), (), impl FnMut() -> impl Future<Output = Result<(), ()>>, impl Future<Output = Result<(), ()>>>(impl FnMut() -> impl Future<Output = Result<(), ()>>)
21942194
167..228 'test(|... })': ()
2195-
172..227 '|| asy... }': impl Fn() -> impl Future<Output = Result<(), ()>>
2195+
172..227 '|| asy... }': impl FnMut() -> impl Future<Output = Result<(), ()>>
21962196
175..227 'async ... }': impl Future<Output = Result<(), ()>>
21972197
191..205 'return Err(())': !
21982198
198..201 'Err': extern "rust-call" Err<(), ()>(()) -> Result<(), ()>

‎crates/hir-ty/src/tests/traits.rs

+19-19
Original file line numberDiff line numberDiff line change
@@ -1333,9 +1333,9 @@ fn foo<const C: u8, T>() -> (impl FnOnce(&str, T), impl Trait<u8>) {
13331333
}
13341334
"#,
13351335
expect![[r#"
1336-
134..165 '{ ...(C)) }': (impl Fn(&str, T), Bar<u8>)
1337-
140..163 '(|inpu...ar(C))': (impl Fn(&str, T), Bar<u8>)
1338-
141..154 '|input, t| {}': impl Fn(&str, T)
1336+
134..165 '{ ...(C)) }': (impl FnOnce(&str, T), Bar<u8>)
1337+
140..163 '(|inpu...ar(C))': (impl FnOnce(&str, T), Bar<u8>)
1338+
141..154 '|input, t| {}': impl FnOnce(&str, T)
13391339
142..147 'input': &str
13401340
149..150 't': T
13411341
152..154 '{}': ()
@@ -1963,20 +1963,20 @@ fn test() {
19631963
163..167 '1u32': u32
19641964
174..175 'x': Option<u32>
19651965
174..190 'x.map(...v + 1)': Option<u32>
1966-
180..189 '|v| v + 1': impl Fn(u32) -> u32
1966+
180..189 '|v| v + 1': impl FnOnce(u32) -> u32
19671967
181..182 'v': u32
19681968
184..185 'v': u32
19691969
184..189 'v + 1': u32
19701970
188..189 '1': u32
19711971
196..197 'x': Option<u32>
19721972
196..212 'x.map(... 1u64)': Option<u64>
1973-
202..211 '|_v| 1u64': impl Fn(u32) -> u64
1973+
202..211 '|_v| 1u64': impl FnOnce(u32) -> u64
19741974
203..205 '_v': u32
19751975
207..211 '1u64': u64
19761976
222..223 'y': Option<i64>
19771977
239..240 'x': Option<u32>
19781978
239..252 'x.map(|_v| 1)': Option<i64>
1979-
245..251 '|_v| 1': impl Fn(u32) -> i64
1979+
245..251 '|_v| 1': impl FnOnce(u32) -> i64
19801980
246..248 '_v': u32
19811981
250..251 '1': i64
19821982
"#]],
@@ -2062,17 +2062,17 @@ fn test() {
20622062
312..314 '{}': ()
20632063
330..489 '{ ... S); }': ()
20642064
340..342 'x1': u64
2065-
345..349 'foo1': fn foo1<S, u64, impl Fn(S) -> u64>(S, impl Fn(S) -> u64) -> u64
2065+
345..349 'foo1': fn foo1<S, u64, impl FnOnce(S) -> u64>(S, impl FnOnce(S) -> u64) -> u64
20662066
345..368 'foo1(S...hod())': u64
20672067
350..351 'S': S
2068-
353..367 '|s| s.method()': impl Fn(S) -> u64
2068+
353..367 '|s| s.method()': impl FnOnce(S) -> u64
20692069
354..355 's': S
20702070
357..358 's': S
20712071
357..367 's.method()': u64
20722072
378..380 'x2': u64
2073-
383..387 'foo2': fn foo2<S, u64, impl Fn(S) -> u64>(impl Fn(S) -> u64, S) -> u64
2073+
383..387 'foo2': fn foo2<S, u64, impl FnOnce(S) -> u64>(impl FnOnce(S) -> u64, S) -> u64
20742074
383..406 'foo2(|...(), S)': u64
2075-
388..402 '|s| s.method()': impl Fn(S) -> u64
2075+
388..402 '|s| s.method()': impl FnOnce(S) -> u64
20762076
389..390 's': S
20772077
392..393 's': S
20782078
392..402 's.method()': u64
@@ -2081,14 +2081,14 @@ fn test() {
20812081
421..422 'S': S
20822082
421..446 'S.foo1...hod())': u64
20832083
428..429 'S': S
2084-
431..445 '|s| s.method()': impl Fn(S) -> u64
2084+
431..445 '|s| s.method()': impl FnOnce(S) -> u64
20852085
432..433 's': S
20862086
435..436 's': S
20872087
435..445 's.method()': u64
20882088
456..458 'x4': u64
20892089
461..462 'S': S
20902090
461..486 'S.foo2...(), S)': u64
2091-
468..482 '|s| s.method()': impl Fn(S) -> u64
2091+
468..482 '|s| s.method()': impl FnOnce(S) -> u64
20922092
469..470 's': S
20932093
472..473 's': S
20942094
472..482 's.method()': u64
@@ -2562,9 +2562,9 @@ fn main() {
25622562
72..74 '_v': F
25632563
117..120 '{ }': ()
25642564
132..163 '{ ... }); }': ()
2565-
138..148 'f::<(), _>': fn f<(), impl Fn(&())>(impl Fn(&()))
2565+
138..148 'f::<(), _>': fn f<(), impl FnOnce(&())>(impl FnOnce(&()))
25662566
138..160 'f::<()... z; })': ()
2567-
149..159 '|z| { z; }': impl Fn(&())
2567+
149..159 '|z| { z; }': impl FnOnce(&())
25682568
150..151 'z': &()
25692569
153..159 '{ z; }': ()
25702570
155..156 'z': &()
@@ -2749,9 +2749,9 @@ fn main() {
27492749
983..998 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
27502750
983..1000 'Vec::<...:new()': Vec<i32>
27512751
983..1012 'Vec::<...iter()': IntoIter<i32>
2752-
983..1075 'Vec::<...one })': FilterMap<IntoIter<i32>, impl Fn(i32) -> Option<u32>>
2752+
983..1075 'Vec::<...one })': FilterMap<IntoIter<i32>, impl FnMut(i32) -> Option<u32>>
27532753
983..1101 'Vec::<... y; })': ()
2754-
1029..1074 '|x| if...None }': impl Fn(i32) -> Option<u32>
2754+
1029..1074 '|x| if...None }': impl FnMut(i32) -> Option<u32>
27552755
1030..1031 'x': i32
27562756
1033..1074 'if x >...None }': Option<u32>
27572757
1036..1037 'x': i32
@@ -2764,7 +2764,7 @@ fn main() {
27642764
1049..1057 'x as u32': u32
27652765
1066..1074 '{ None }': Option<u32>
27662766
1068..1072 'None': Option<u32>
2767-
1090..1100 '|y| { y; }': impl Fn(u32)
2767+
1090..1100 '|y| { y; }': impl FnMut(u32)
27682768
1091..1092 'y': u32
27692769
1094..1100 '{ y; }': ()
27702770
1096..1097 'y': u32
@@ -3101,8 +3101,8 @@ fn foo() {
31013101
232..236 'None': Option<i32>
31023102
246..247 'f': Box<dyn FnOnce(&Option<i32>)>
31033103
281..310 'Box { ... {}) }': Box<dyn FnOnce(&Option<i32>)>
3104-
294..308 '&mut (|ps| {})': &mut impl Fn(&Option<i32>)
3105-
300..307 '|ps| {}': impl Fn(&Option<i32>)
3104+
294..308 '&mut (|ps| {})': &mut impl FnOnce(&Option<i32>)
3105+
300..307 '|ps| {}': impl FnOnce(&Option<i32>)
31063106
301..303 'ps': &Option<i32>
31073107
305..307 '{}': ()
31083108
316..317 'f': Box<dyn FnOnce(&Option<i32>)>

0 commit comments

Comments
 (0)