about summary refs log tree commit diff
path: root/src/test/codegen/integer-cmp.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-29 11:20:45 +0000
committerbors <bors@rust-lang.org>2019-08-29 11:20:45 +0000
commit7445622bcb515c822a2fc6e8c57c90478c1a56bb (patch)
tree3c3cd79e15fce31f7d5ef8792249a7de33646bce /src/test/codegen/integer-cmp.rs
parent85ed538d6988c6c82aea8750b306cb793e874294 (diff)
parent3f05cf6776fe9682200b1327b7131219710120b2 (diff)
downloadrust-7445622bcb515c822a2fc6e8c57c90478c1a56bb.tar.gz
rust-7445622bcb515c822a2fc6e8c57c90478c1a56bb.zip
Auto merge of #63998 - Centril:rollup-pfuwxz3, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #63867 (resolve: Block expansion of a derive container until all its derives are resolved)
 - #63880 (Validation: check raw wide pointer metadata)
 - #63914 (ty: use Align for ReprOptions pack and align.)
 - #63941 (rustbuild: allow disabling deny(warnings) for bootstrap)
 - #63949 (Fix build src/libtest)
 - #63984 (Update rust-installer to limit memory use)
 - #63992 (Small improvement for Ord implementation of integers)

Failed merges:

r? @ghost
Diffstat (limited to 'src/test/codegen/integer-cmp.rs')
-rw-r--r--src/test/codegen/integer-cmp.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/integer-cmp.rs b/src/test/codegen/integer-cmp.rs
index 1373b12e372..8ada3cf09d0 100644
--- a/src/test/codegen/integer-cmp.rs
+++ b/src/test/codegen/integer-cmp.rs
@@ -11,7 +11,7 @@ use std::cmp::Ordering;
 #[no_mangle]
 pub fn cmp_signed(a: i64, b: i64) -> Ordering {
 // CHECK: icmp slt
-// CHECK: icmp sgt
+// CHECK: icmp ne
 // CHECK: zext i1
 // CHECK: select i1
     a.cmp(&b)
@@ -21,7 +21,7 @@ pub fn cmp_signed(a: i64, b: i64) -> Ordering {
 #[no_mangle]
 pub fn cmp_unsigned(a: u32, b: u32) -> Ordering {
 // CHECK: icmp ult
-// CHECK: icmp ugt
+// CHECK: icmp ne
 // CHECK: zext i1
 // CHECK: select i1
     a.cmp(&b)