Skip to content

Commit

Permalink
Update expectation tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShoyuVanilla
ShoyuVanilla committed Feb 26, 2024
1 parent e36a31b commit 46cdce1
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions crates/hir-ty/src/tests/patterns.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,25 +702,25 @@ fn test() {
51..58 'loop {}': !
56..58 '{}': ()
72..171 '{ ... x); }': ()
78..81 'foo': fn foo<&(i32, &str), i32, impl Fn(&(i32, &str)) -> i32>(&(i32, &str), impl Fn(&(i32, &str)) -> i32) -> i32
78..81 'foo': fn foo<&(i32, &str), i32, impl FnOnce(&(i32, &str)) -> i32>(&(i32, &str), impl FnOnce(&(i32, &str)) -> i32) -> i32
78..105 'foo(&(...y)| x)': i32
82..91 '&(1, "a")': &(i32, &str)
83..91 '(1, "a")': (i32, &str)
84..85 '1': i32
87..90 '"a"': &str
93..104 '|&(x, y)| x': impl Fn(&(i32, &str)) -> i32
93..104 '|&(x, y)| x': impl FnOnce(&(i32, &str)) -> i32
94..101 '&(x, y)': &(i32, &str)
95..101 '(x, y)': (i32, &str)
96..97 'x': i32
99..100 'y': &str
103..104 'x': i32
142..145 'foo': fn foo<&(i32, &str), &i32, impl Fn(&(i32, &str)) -> &i32>(&(i32, &str), impl Fn(&(i32, &str)) -> &i32) -> &i32
142..145 'foo': fn foo<&(i32, &str), &i32, impl FnOnce(&(i32, &str)) -> &i32>(&(i32, &str), impl FnOnce(&(i32, &str)) -> &i32) -> &i32
142..168 'foo(&(...y)| x)': &i32
146..155 '&(1, "a")': &(i32, &str)
147..155 '(1, "a")': (i32, &str)
148..149 '1': i32
151..154 '"a"': &str
157..167 '|(x, y)| x': impl Fn(&(i32, &str)) -> &i32
157..167 '|(x, y)| x': impl FnOnce(&(i32, &str)) -> &i32
158..164 '(x, y)': (i32, &str)
159..160 'x': &i32
162..163 'y': &&str
Expand Down
2 changes: 1 addition & 1 deletion crates/hir-ty/src/tests/regression.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ fn main() {
123..126 'S()': S<i32>
132..133 's': S<i32>
132..144 's.g(|_x| {})': ()
136..143 '|_x| {}': impl Fn(&i32)
136..143 '|_x| {}': impl FnOnce(&i32)
137..139 '_x': &i32
141..143 '{}': ()
150..151 's': S<i32>
Expand Down
4 changes: 2 additions & 2 deletions crates/hir-ty/src/tests/simple.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2190,9 +2190,9 @@ fn main() {
149..151 'Ok': extern "rust-call" Ok<(), ()>(()) -> Result<(), ()>
149..155 'Ok(())': Result<(), ()>
152..154 '()': ()
167..171 'test': fn test<(), (), impl Fn() -> impl Future<Output = Result<(), ()>>, impl Future<Output = Result<(), ()>>>(impl Fn() -> impl Future<Output = Result<(), ()>>)
167..171 'test': fn test<(), (), impl FnMut() -> impl Future<Output = Result<(), ()>>, impl Future<Output = Result<(), ()>>>(impl FnMut() -> impl Future<Output = Result<(), ()>>)
167..228 'test(|... })': ()
172..227 '|| asy... }': impl Fn() -> impl Future<Output = Result<(), ()>>
172..227 '|| asy... }': impl FnMut() -> impl Future<Output = Result<(), ()>>
175..227 'async ... }': impl Future<Output = Result<(), ()>>
191..205 'return Err(())': !
198..201 'Err': extern "rust-call" Err<(), ()>(()) -> Result<(), ()>
Expand Down
38 changes: 19 additions & 19 deletions crates/hir-ty/src/tests/traits.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1333,9 +1333,9 @@ fn foo<const C: u8, T>() -> (impl FnOnce(&str, T), impl Trait<u8>) {
}
"#,
expect![[r#"
134..165 '{ ...(C)) }': (impl Fn(&str, T), Bar<u8>)
140..163 '(|inpu...ar(C))': (impl Fn(&str, T), Bar<u8>)
141..154 '|input, t| {}': impl Fn(&str, T)
134..165 '{ ...(C)) }': (impl FnOnce(&str, T), Bar<u8>)
140..163 '(|inpu...ar(C))': (impl FnOnce(&str, T), Bar<u8>)
141..154 '|input, t| {}': impl FnOnce(&str, T)
142..147 'input': &str
149..150 't': T
152..154 '{}': ()
Expand Down Expand Up @@ -1963,20 +1963,20 @@ fn test() {
163..167 '1u32': u32
174..175 'x': Option<u32>
174..190 'x.map(...v + 1)': Option<u32>
180..189 '|v| v + 1': impl Fn(u32) -> u32
180..189 '|v| v + 1': impl FnOnce(u32) -> u32
181..182 'v': u32
184..185 'v': u32
184..189 'v + 1': u32
188..189 '1': u32
196..197 'x': Option<u32>
196..212 'x.map(... 1u64)': Option<u64>
202..211 '|_v| 1u64': impl Fn(u32) -> u64
202..211 '|_v| 1u64': impl FnOnce(u32) -> u64
203..205 '_v': u32
207..211 '1u64': u64
222..223 'y': Option<i64>
239..240 'x': Option<u32>
239..252 'x.map(|_v| 1)': Option<i64>
245..251 '|_v| 1': impl Fn(u32) -> i64
245..251 '|_v| 1': impl FnOnce(u32) -> i64
246..248 '_v': u32
250..251 '1': i64
"#]],
Expand Down Expand Up @@ -2062,17 +2062,17 @@ fn test() {
312..314 '{}': ()
330..489 '{ ... S); }': ()
340..342 'x1': u64
345..349 'foo1': fn foo1<S, u64, impl Fn(S) -> u64>(S, impl Fn(S) -> u64) -> u64
345..349 'foo1': fn foo1<S, u64, impl FnOnce(S) -> u64>(S, impl FnOnce(S) -> u64) -> u64
345..368 'foo1(S...hod())': u64
350..351 'S': S
353..367 '|s| s.method()': impl Fn(S) -> u64
353..367 '|s| s.method()': impl FnOnce(S) -> u64
354..355 's': S
357..358 's': S
357..367 's.method()': u64
378..380 'x2': u64
383..387 'foo2': fn foo2<S, u64, impl Fn(S) -> u64>(impl Fn(S) -> u64, S) -> u64
383..387 'foo2': fn foo2<S, u64, impl FnOnce(S) -> u64>(impl FnOnce(S) -> u64, S) -> u64
383..406 'foo2(|...(), S)': u64
388..402 '|s| s.method()': impl Fn(S) -> u64
388..402 '|s| s.method()': impl FnOnce(S) -> u64
389..390 's': S
392..393 's': S
392..402 's.method()': u64
Expand All @@ -2081,14 +2081,14 @@ fn test() {
421..422 'S': S
421..446 'S.foo1...hod())': u64
428..429 'S': S
431..445 '|s| s.method()': impl Fn(S) -> u64
431..445 '|s| s.method()': impl FnOnce(S) -> u64
432..433 's': S
435..436 's': S
435..445 's.method()': u64
456..458 'x4': u64
461..462 'S': S
461..486 'S.foo2...(), S)': u64
468..482 '|s| s.method()': impl Fn(S) -> u64
468..482 '|s| s.method()': impl FnOnce(S) -> u64
469..470 's': S
472..473 's': S
472..482 's.method()': u64
Expand Down Expand Up @@ -2562,9 +2562,9 @@ fn main() {
72..74 '_v': F
117..120 '{ }': ()
132..163 '{ ... }); }': ()
138..148 'f::<(), _>': fn f<(), impl Fn(&())>(impl Fn(&()))
138..148 'f::<(), _>': fn f<(), impl FnOnce(&())>(impl FnOnce(&()))
138..160 'f::<()... z; })': ()
149..159 '|z| { z; }': impl Fn(&())
149..159 '|z| { z; }': impl FnOnce(&())
150..151 'z': &()
153..159 '{ z; }': ()
155..156 'z': &()
Expand Down Expand Up @@ -2749,9 +2749,9 @@ fn main() {
983..998 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
983..1000 'Vec::<...:new()': Vec<i32>
983..1012 'Vec::<...iter()': IntoIter<i32>
983..1075 'Vec::<...one })': FilterMap<IntoIter<i32>, impl Fn(i32) -> Option<u32>>
983..1075 'Vec::<...one })': FilterMap<IntoIter<i32>, impl FnMut(i32) -> Option<u32>>
983..1101 'Vec::<... y; })': ()
1029..1074 '|x| if...None }': impl Fn(i32) -> Option<u32>
1029..1074 '|x| if...None }': impl FnMut(i32) -> Option<u32>
1030..1031 'x': i32
1033..1074 'if x >...None }': Option<u32>
1036..1037 'x': i32
Expand All @@ -2764,7 +2764,7 @@ fn main() {
1049..1057 'x as u32': u32
1066..1074 '{ None }': Option<u32>
1068..1072 'None': Option<u32>
1090..1100 '|y| { y; }': impl Fn(u32)
1090..1100 '|y| { y; }': impl FnMut(u32)
1091..1092 'y': u32
1094..1100 '{ y; }': ()
1096..1097 'y': u32
Expand Down Expand Up @@ -3101,8 +3101,8 @@ fn foo() {
232..236 'None': Option<i32>
246..247 'f': Box<dyn FnOnce(&Option<i32>)>
281..310 'Box { ... {}) }': Box<dyn FnOnce(&Option<i32>)>
294..308 '&mut (|ps| {})': &mut impl Fn(&Option<i32>)
300..307 '|ps| {}': impl Fn(&Option<i32>)
294..308 '&mut (|ps| {})': &mut impl FnOnce(&Option<i32>)
300..307 '|ps| {}': impl FnOnce(&Option<i32>)
301..303 'ps': &Option<i32>
305..307 '{}': ()
316..317 'f': Box<dyn FnOnce(&Option<i32>)>
Expand Down

0 comments on commit 46cdce1

Please sign in to comment.