about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorJeremy Soller <jackpot51@gmail.com>2016-11-19 20:31:42 -0700
committerJeremy Soller <jackpot51@gmail.com>2016-11-19 20:31:42 -0700
commitae2029fc62d744e252a5a077ce0dfbf2d1683d25 (patch)
tree8b7a0aebcf10870fd331c8d76dc00f19091b2713 /src/test/codegen
parent2556400a5d4c9b56084332c29b6c91ac5cd3a9fa (diff)
parent0bd2ce62b27e2b9a7dfe92fc23d9098854008089 (diff)
downloadrust-ae2029fc62d744e252a5a077ce0dfbf2d1683d25.tar.gz
rust-ae2029fc62d744e252a5a077ce0dfbf2d1683d25.zip
Merge branch 'master' into redox
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/lifetime_start_end.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/codegen/lifetime_start_end.rs b/src/test/codegen/lifetime_start_end.rs
index 81f6cf309da..e3b35cf3552 100644
--- a/src/test/codegen/lifetime_start_end.rs
+++ b/src/test/codegen/lifetime_start_end.rs
@@ -27,16 +27,16 @@ pub fn test() {
         let b = &Some(a);
         &b; // keep variable in an alloca
 
-// CHECK: [[S_b:%[0-9]+]] = bitcast %"2.std::option::Option<i32>"** %b to i8*
+// CHECK: [[S_b:%[0-9]+]] = bitcast %"core::option::Option<i32>"** %b to i8*
 // CHECK: call void @llvm.lifetime.start(i{{[0-9 ]+}}, i8* [[S_b]])
 
-// CHECK: [[S__5:%[0-9]+]] = bitcast %"2.std::option::Option<i32>"* %_5 to i8*
+// CHECK: [[S__5:%[0-9]+]] = bitcast %"core::option::Option<i32>"* %_5 to i8*
 // CHECK: call void @llvm.lifetime.start(i{{[0-9 ]+}}, i8* [[S__5]])
 
-// CHECK: [[E__5:%[0-9]+]] = bitcast %"2.std::option::Option<i32>"* %_5 to i8*
+// CHECK: [[E__5:%[0-9]+]] = bitcast %"core::option::Option<i32>"* %_5 to i8*
 // CHECK: call void @llvm.lifetime.end(i{{[0-9 ]+}}, i8* [[E__5]])
 
-// CHECK: [[E_b:%[0-9]+]] = bitcast %"2.std::option::Option<i32>"** %b to i8*
+// CHECK: [[E_b:%[0-9]+]] = bitcast %"core::option::Option<i32>"** %b to i8*
 // CHECK: call void @llvm.lifetime.end(i{{[0-9 ]+}}, i8* [[E_b]])
     }