Skip to content

Commit d67510e

Browse files
epageepage
committed
refactor: Resolve deprecations
1 parent 20a12b6 commit d67510e

File tree

3 files changed

+70
-55
lines changed

3 files changed

+70
-55
lines changed

‎tests/testsuite/alias.rs

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ fn list_no_config() {
2121
.env("HOME", &home_root)
2222
.assert()
2323
.success()
24-
.stdout_eq_(str![[r#"
24+
.stdout_eq(
25+
str![[r#"
2526
[alias]
2627
# next = stack next # unregistered
2728
# prev = stack previous # unregistered
@@ -30,8 +31,10 @@ fn list_no_config() {
3031
# sync = stack sync # unregistered
3132
# run = stack run # unregistered
3233
33-
"#]].raw())
34-
.stderr_eq_(str![[r#"
34+
"#]]
35+
.raw(),
36+
)
37+
.stderr_eq(str![[r#"
3538
note: To register, pass `--register`
3639
3740
"#]]);
@@ -64,7 +67,8 @@ fn list_global_config() {
6467
.env("HOME", &home_root)
6568
.assert()
6669
.success()
67-
.stdout_eq_(str![[r#"
70+
.stdout_eq(
71+
str![[r#"
6872
[alias]
6973
next = foo # instead of `stack next`
7074
# prev = stack previous # unregistered
@@ -73,8 +77,10 @@ fn list_global_config() {
7377
# sync = stack sync # unregistered
7478
# run = stack run # unregistered
7579
76-
"#]].raw())
77-
.stderr_eq_(str![[r#"
80+
"#]]
81+
.raw(),
82+
)
83+
.stderr_eq(str![[r#"
7884
note: To register, pass `--register`
7985
8086
"#]]);
@@ -100,8 +106,8 @@ fn register_no_config() {
100106
.env("HOME", &home_root)
101107
.assert()
102108
.success()
103-
.stdout_eq_(str![].raw())
104-
.stderr_eq_(str![[r#"
109+
.stdout_eq(str![].raw())
110+
.stderr_eq(str![[r#"
105111
Registering: next="stack next"
106112
Registering: prev="stack previous"
107113
Registering: reword="stack reword"
@@ -117,7 +123,8 @@ Registering: run="stack run"
117123
.env("HOME", &home_root)
118124
.assert()
119125
.success()
120-
.stdout_eq_(str![[r#"
126+
.stdout_eq(
127+
str![[r#"
121128
[alias]
122129
next = stack next # registered
123130
prev = stack previous # registered
@@ -126,8 +133,10 @@ Registering: run="stack run"
126133
sync = stack sync # registered
127134
run = stack run # registered
128135
129-
"#]].raw())
130-
.stderr_eq_(str![[r#"
136+
"#]]
137+
.raw(),
138+
)
139+
.stderr_eq(str![[r#"
131140
note: To unregister, pass `--unregister`
132141
133142
"#]]);
@@ -162,8 +171,8 @@ fn register_no_overwrite_alias() {
162171
.env("HOME", &home_root)
163172
.assert()
164173
.failure()
165-
.stdout_eq_(str![].raw())
166-
.stderr_eq_(str![[r#"
174+
.stdout_eq(str![].raw())
175+
.stderr_eq(str![[r#"
167176
error: next="foo" is registered, not overwriting with "stack next"
168177
Registering: reword="stack reword"
169178
Registering: amend="stack amend"
@@ -178,7 +187,8 @@ Registering: run="stack run"
178187
.env("HOME", &home_root)
179188
.assert()
180189
.success()
181-
.stdout_eq_(str![[r#"
190+
.stdout_eq(
191+
str![[r#"
182192
[alias]
183193
next = foo # instead of `stack next`
184194
prev = stack previous -v # diverged from "stack previous"
@@ -187,8 +197,10 @@ Registering: run="stack run"
187197
sync = stack sync # registered
188198
run = stack run # registered
189199
190-
"#]].raw())
191-
.stderr_eq_(str![[r#"
200+
"#]]
201+
.raw(),
202+
)
203+
.stderr_eq(str![[r#"
192204
note: To unregister, pass `--unregister`
193205
194206
"#]]);
@@ -222,8 +234,8 @@ fn register_unregister() {
222234
.env("HOME", &home_root)
223235
.assert()
224236
.success()
225-
.stdout_eq_(str![])
226-
.stderr_eq_(str![[r#"
237+
.stdout_eq(str![])
238+
.stderr_eq(str![[r#"
227239
Unregistering: next="stack next"
228240
Unregistering: prev="stack previous"
229241
Unregistering: reword="stack reword"
@@ -262,8 +274,8 @@ fn reregister() {
262274
.env("HOME", &home_root)
263275
.assert()
264276
.success()
265-
.stdout_eq_(str![].raw())
266-
.stderr_eq_(str![]);
277+
.stdout_eq(str![].raw())
278+
.stderr_eq(str![]);
267279

268280
root.close().unwrap();
269281
}
@@ -286,8 +298,8 @@ fn unregister_no_config() {
286298
.env("HOME", &home_root)
287299
.assert()
288300
.success()
289-
.stdout_eq_(str![].raw())
290-
.stderr_eq_(str![]);
301+
.stdout_eq(str![].raw())
302+
.stderr_eq(str![]);
291303

292304
root.close().unwrap();
293305
}
@@ -320,8 +332,8 @@ fn unregister_existing_config() {
320332
.env("HOME", &home_root)
321333
.assert()
322334
.success()
323-
.stdout_eq_(str![].raw())
324-
.stderr_eq_(str![[r#"
335+
.stdout_eq(str![].raw())
336+
.stderr_eq(str![[r#"
325337
Unregistering: prev="stack previous -v"
326338
Unregistering: reword="stack reword"
327339
@@ -333,7 +345,8 @@ Unregistering: reword="stack reword"
333345
.env("HOME", &home_root)
334346
.assert()
335347
.success()
336-
.stdout_eq_(str![[r#"
348+
.stdout_eq(
349+
str![[r#"
337350
[alias]
338351
next = foo # instead of `stack next`
339352
# prev = stack previous # unregistered
@@ -342,8 +355,10 @@ Unregistering: reword="stack reword"
342355
# sync = stack sync # unregistered
343356
# run = stack run # unregistered
344357
345-
"#]].raw())
346-
.stderr_eq_(str![[r#"
358+
"#]]
359+
.raw(),
360+
)
361+
.stderr_eq(str![[r#"
347362
note: To register, pass `--register`
348363
349364
"#]]);

‎tests/testsuite/amend.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ fn amend_noop() {
5252
.current_dir(root_path)
5353
.assert()
5454
.failure()
55-
.stdout_eq_(str![].raw())
56-
.stderr_eq_(str![[r#"
55+
.stdout_eq(str![].raw())
56+
.stderr_eq(str![[r#"
5757
error: nothing to amend to [..]: C
5858
5959
"#]]);
@@ -102,8 +102,8 @@ fn reword_protected_fails() {
102102
.current_dir(root_path)
103103
.assert()
104104
.failure()
105-
.stdout_eq_(str![].raw())
106-
.stderr_eq_(
105+
.stdout_eq(str![].raw())
106+
.stderr_eq(
107107
str![[r#"
108108
cannot amend protected commits
109109
@@ -172,8 +172,8 @@ fn reword() {
172172
.current_dir(root_path)
173173
.assert()
174174
.success()
175-
.stdout_eq_(str![].raw())
176-
.stderr_eq_(str![[r#"
175+
.stdout_eq(str![].raw())
176+
.stderr_eq(str![[r#"
177177
Saved working directory and index state WIP on target (amend): [..]
178178
Amended to [..]: C
179179
Dropped refs/stash [..]
@@ -244,8 +244,8 @@ fn reword_rebases() {
244244
.current_dir(root_path)
245245
.assert()
246246
.success()
247-
.stdout_eq_(str![].raw())
248-
.stderr_eq_(str![[r#"
247+
.stdout_eq(str![].raw())
248+
.stderr_eq(str![[r#"
249249
Saved working directory and index state WIP on local (amend): [..]
250250
Amended to [..]: B
251251
Dropped refs/stash [..]
@@ -321,8 +321,8 @@ fn amend_add() {
321321
.current_dir(root_path)
322322
.assert()
323323
.success()
324-
.stdout_eq_(str![].raw())
325-
.stderr_eq_(str![[r#"
324+
.stdout_eq(str![].raw())
325+
.stderr_eq(str![[r#"
326326
Adding c
327327
Amended to [..]: C
328328
note: to undo, run `git branch-stash pop git-stack`
@@ -391,8 +391,8 @@ fn amend_staged() {
391391
.current_dir(root_path)
392392
.assert()
393393
.success()
394-
.stdout_eq_(str![].raw())
395-
.stderr_eq_(str![[r#"
394+
.stdout_eq(str![].raw())
395+
.stderr_eq(str![[r#"
396396
Saved working directory and index state WIP on target (amend): [..]
397397
Amended to [..]: C
398398
Dropped refs/stash [..]
@@ -468,8 +468,8 @@ fn amend_detached() {
468468
.current_dir(root_path)
469469
.assert()
470470
.success()
471-
.stdout_eq_(str![].raw())
472-
.stderr_eq_(str![[r#"
471+
.stdout_eq(str![].raw())
472+
.stderr_eq(str![[r#"
473473
Saved working directory and index state WIP on HEAD (amend): [..]
474474
Amended to [..]: B
475475
Dropped refs/stash [..]
@@ -552,8 +552,8 @@ fn amend_explicit_head() {
552552
.current_dir(root_path)
553553
.assert()
554554
.success()
555-
.stdout_eq_(str![].raw())
556-
.stderr_eq_(str![[r#"
555+
.stdout_eq(str![].raw())
556+
.stderr_eq(str![[r#"
557557
Saved working directory and index state WIP on target (amend): [..]
558558
Amended to [..]: C
559559
Dropped refs/stash [..]
@@ -630,8 +630,8 @@ fn amend_ancestor() {
630630
.current_dir(root_path)
631631
.assert()
632632
.success()
633-
.stdout_eq_(str![].raw())
634-
.stderr_eq_(str![[r#"
633+
.stdout_eq(str![].raw())
634+
.stderr_eq(str![[r#"
635635
Saved working directory and index state WIP on local (amend): [..]
636636
Amended to [..]: B
637637
Dropped refs/stash [..]
@@ -715,8 +715,8 @@ fn amend_conflict() {
715715
.current_dir(root_path)
716716
.assert()
717717
.failure()
718-
.stdout_eq_(str![].raw())
719-
.stderr_eq_(str![[r#"
718+
.stdout_eq(str![].raw())
719+
.stderr_eq(str![[r#"
720720
Saved working directory and index state WIP on local (amend): [..]
721721
ERROR: Failed to re-stack branch `local`: squash conflicts:
722722
c

‎tests/testsuite/reword.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ fn reword_protected_fails() {
3434
.current_dir(root_path)
3535
.assert()
3636
.failure()
37-
.stdout_eq_(str![].raw())
38-
.stderr_eq_(
37+
.stdout_eq(str![].raw())
38+
.stderr_eq(
3939
str![[r#"
4040
cannot reword protected commits
4141
@@ -99,8 +99,8 @@ fn reword_implicit_head() {
9999
.current_dir(root_path)
100100
.assert()
101101
.success()
102-
.stdout_eq_(str![].raw())
103-
.stderr_eq_(
102+
.stdout_eq(str![].raw())
103+
.stderr_eq(
104104
str![[r#"
105105
note: to undo, run `git branch-stash pop git-stack`
106106
@@ -171,8 +171,8 @@ fn reword_explicit_head() {
171171
.current_dir(root_path)
172172
.assert()
173173
.success()
174-
.stdout_eq_(str![].raw())
175-
.stderr_eq_(
174+
.stdout_eq(str![].raw())
175+
.stderr_eq(
176176
str![[r#"
177177
note: to undo, run `git branch-stash pop git-stack`
178178
@@ -246,8 +246,8 @@ fn reword_branch() {
246246
.current_dir(root_path)
247247
.assert()
248248
.success()
249-
.stdout_eq_(str![].raw())
250-
.stderr_eq_(str![[r#"
249+
.stdout_eq(str![].raw())
250+
.stderr_eq(str![[r#"
251251
Saved working directory and index state WIP on local (reword): [..]
252252
Dropped refs/stash [..]
253253
note: to undo, run `git branch-stash pop git-stack`

0 commit comments

Comments
 (0)