resolved conflicts
This commit is contained in:
darklyspaced 2023-08-18 19:45:06 +08:00
parent cbb36d808b
commit b05f211519

View File

@ -1,28 +1,28 @@
[$DIR/dbg-macro-expected-behavior.rs:22] Unit = Unit [$DIR/dbg-macro-expected-behavior.rs:22:19] Unit = Unit
[$DIR/dbg-macro-expected-behavior.rs:23] a = Unit [$DIR/dbg-macro-expected-behavior.rs:23:19] a = Unit
[$DIR/dbg-macro-expected-behavior.rs:29] Point { x: 42, y: 24 } = Point { [$DIR/dbg-macro-expected-behavior.rs:29:24] Point { x: 42, y: 24 } = Point {
x: 42, x: 42,
y: 24, y: 24,
} }
[$DIR/dbg-macro-expected-behavior.rs:30] b = Point { [$DIR/dbg-macro-expected-behavior.rs:30:24] b = Point {
x: 42, x: 42,
y: 24, y: 24,
} }
[$DIR/dbg-macro-expected-behavior.rs:38] [$DIR/dbg-macro-expected-behavior.rs:38:17]
[$DIR/dbg-macro-expected-behavior.rs:42] &a = NoCopy( [$DIR/dbg-macro-expected-behavior.rs:42:27] &a = NoCopy(
1337, 1337,
) )
[$DIR/dbg-macro-expected-behavior.rs:42] dbg!(&a) = NoCopy( [$DIR/dbg-macro-expected-behavior.rs:42:22] dbg!(&a) = NoCopy(
1337, 1337,
) )
[$DIR/dbg-macro-expected-behavior.rs:47] f(&42) = 42 [$DIR/dbg-macro-expected-behavior.rs:47:18] f(&42) = 42
before before
[$DIR/dbg-macro-expected-behavior.rs:52] { foo += 1; eprintln!("before"); 7331 } = 7331 [$DIR/dbg-macro-expected-behavior.rs:52:22] { foo += 1; eprintln!("before"); 7331 } = 7331
[$DIR/dbg-macro-expected-behavior.rs:60] ("Yeah",) = ( [$DIR/dbg-macro-expected-behavior.rs:60:27] ("Yeah",) = (
"Yeah", "Yeah",
) )
[$DIR/dbg-macro-expected-behavior.rs:63] 1 = 1 [$DIR/dbg-macro-expected-behavior.rs:63:29] 1 = 1
[$DIR/dbg-macro-expected-behavior.rs:63] 2 = 2 [$DIR/dbg-macro-expected-behavior.rs:63:29] 2 = 2
[$DIR/dbg-macro-expected-behavior.rs:67] 1u8 = 1 [$DIR/dbg-macro-expected-behavior.rs:67:37] 1u8 = 1
[$DIR/dbg-macro-expected-behavior.rs:67] 2u32 = 2 [$DIR/dbg-macro-expected-behavior.rs:67:37] 2u32 = 2
[$DIR/dbg-macro-expected-behavior.rs:67] "Yeah" = "Yeah" [$DIR/dbg-macro-expected-behavior.rs:67:37] "Yeah" = "Yeah"