File tree 2 files changed +24
-24
lines changed
2 files changed +24
-24
lines changed Original file line number Diff line number Diff line change @@ -1616,21 +1616,21 @@ fn reuse_panic_pm() {
1616
1616
1617
1617
// bar is built once without panic (for proc-macro) and once with (for the
1618
1618
// normal dependency).
1619
- // TODO: Migrating to Snapbox might cause flakyness here. See https://github.com/rust-lang/cargo/pull/14161/files#r1660071433
1620
- #[ expect( deprecated) ]
1621
1619
p. cargo ( "build -v" )
1622
- . with_stderr_unordered (
1623
- " \
1620
+ . with_stderr_data (
1621
+ str! [ [ r#"
1624
1622
[LOCKING] 2 packages to latest compatible versions
1625
- [COMPILING] bar [..]
1626
- [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/lib.rs [..]--crate-type lib --emit=[..]link [..]
1627
- [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/lib.rs [..]--crate-type lib --emit=[..]link -C panic=abort[..]-C debuginfo=2 [..]
1628
- [COMPILING] somepm [..]
1623
+ [COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
1624
+ [RUNNING] `rustc --crate-name bar [..] -C panic=abort [..]
1625
+ [RUNNING] `rustc --crate-name bar [..]
1626
+ [COMPILING] somepm v0.0.1 ([ROOT]/foo/somepm)
1629
1627
[RUNNING] `rustc --crate-name somepm [..]
1630
- [COMPILING] foo [..]
1631
- [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]-C panic=abort[..]
1632
- [FINISHED] [..]
1633
- " ,
1628
+ [COMPILING] foo v0.0.1 ([ROOT]/foo)
1629
+ [RUNNING] `rustc --crate-name foo [..] -C panic=abort [..]
1630
+ [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
1631
+
1632
+ "# ] ]
1633
+ . unordered ( ) ,
1634
1634
)
1635
1635
. run ( ) ;
1636
1636
}
Original file line number Diff line number Diff line change @@ -1639,22 +1639,22 @@ fn reuse_panic_pm() {
1639
1639
1640
1640
// bar is built once without panic (for proc-macro) and once with (for the
1641
1641
// normal dependency).
1642
- // TODO: Migrating to Snapbox might cause flakyness here. See https://github.com/rust-lang/cargo/pull/14161/files#r1660071433
1643
- #[ expect( deprecated) ]
1644
1642
p. cargo ( "build -Zchecksum-freshness -v" )
1645
1643
. masquerade_as_nightly_cargo ( & [ "checksum-freshness" ] )
1646
- . with_stderr_unordered (
1647
- " \
1644
+ . with_stderr_data (
1645
+ str! [ [ r#"
1648
1646
[LOCKING] 2 packages to latest compatible versions
1649
- [COMPILING] bar [..]
1650
- [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/lib.rs [..]--crate-type lib --emit=[..]link [..]
1651
- [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/lib.rs [..]--crate-type lib --emit=[..]link -C panic=abort[..]-C debuginfo=2 [..]
1652
- [COMPILING] somepm [..]
1647
+ [COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
1648
+ [RUNNING] `rustc --crate-name bar [..] -C panic=abort [..]
1649
+ [RUNNING] `rustc --crate-name bar [..]
1650
+ [COMPILING] somepm v0.0.1 ([ROOT]/foo/somepm)
1653
1651
[RUNNING] `rustc --crate-name somepm [..]
1654
- [COMPILING] foo [..]
1655
- [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]-C panic=abort[..]
1656
- [FINISHED] [..]
1657
- " ,
1652
+ [COMPILING] foo v0.0.1 ([ROOT]/foo)
1653
+ [RUNNING] `rustc --crate-name foo [..] -C panic=abort [..]
1654
+ [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
1655
+
1656
+ "# ] ]
1657
+ . unordered ( ) ,
1658
1658
)
1659
1659
. run ( ) ;
1660
1660
}
You can’t perform that action at this time.
0 commit comments