about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-30 15:08:03 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-30 19:55:37 -0800
commite8fd9d3d0bf0f4974460337df29c0d3ceb514987 (patch)
tree53fc5aaa615f1c6e5abd757e42a75b3d19ce3abb
parent64dd7be2c5faae1946989c5e1df4d0c6172be1be (diff)
parent1d00c545ede609b9d43fdf9f252c15da5a66dac7 (diff)
downloadrust-e8fd9d3d0bf0f4974460337df29c0d3ceb514987.tar.gz
rust-e8fd9d3d0bf0f4974460337df29c0d3ceb514987.zip
Merge remote-tracking branch 'origin/master' into rollup
-rw-r--r--src/test/debuginfo/generic-struct.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/debuginfo/generic-struct.rs b/src/test/debuginfo/generic-struct.rs
index 0eb65f2d80f..696d2703bde 100644
--- a/src/test/debuginfo/generic-struct.rs
+++ b/src/test/debuginfo/generic-struct.rs
@@ -32,14 +32,14 @@
 // lldb-command:run
 
 // lldb-command:print int_int
-// lldb-check:[...]$0 = AGenericStruct<isize, isize> { key: 0, value: 1 }
+// lldb-check:[...]$0 = AGenericStruct<i32, i32> { key: 0, value: 1 }
 // lldb-command:print int_float
-// lldb-check:[...]$1 = AGenericStruct<isize, f64> { key: 2, value: 3.5 }
+// lldb-check:[...]$1 = AGenericStruct<i32, f64> { key: 2, value: 3.5 }
 // lldb-command:print float_int
-// lldb-check:[...]$2 = AGenericStruct<f64, isize> { key: 4.5, value: 5 }
+// lldb-check:[...]$2 = AGenericStruct<f64, i32> { key: 4.5, value: 5 }
 
 // lldb-command:print float_int_float
-// lldb-check:[...]$3 = AGenericStruct<f64, generic-struct::AGenericStruct<isize, f64>> { key: 6.5, value: AGenericStruct<isize, f64> { key: 7, value: 8.5 } }
+// lldb-check:[...]$3 = AGenericStruct<f64, generic-struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
 
 
 #![omit_gdb_pretty_printer_section]