diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2020-03-02 18:53:56 +0100 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2020-03-03 01:00:32 +0100 |
| commit | 5abaeb3d6712b54f3309df968ebee39e544d0fcc (patch) | |
| tree | 57caccfdb40a002056ed640fb0605282d4f7f852 | |
| parent | e364c283fd15e5bc43ed1b7c0e8c86b0c8bd44d8 (diff) | |
| download | rust-5abaeb3d6712b54f3309df968ebee39e544d0fcc.tar.gz rust-5abaeb3d6712b54f3309df968ebee39e544d0fcc.zip | |
Simplify conditions like x + 1 <= y to x < y
| -rw-r--r-- | src/liballoc/collections/btree/node.rs | 2 | ||||
| -rw-r--r-- | src/librustc/mir/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index c1bd68a020a..362755f8b7f 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -1191,7 +1191,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker:: let right_len = right_node.len(); // necessary for correctness, but in a private module - assert!(left_len + right_len + 1 <= CAPACITY); + assert!(left_len + right_len < CAPACITY); unsafe { ptr::write( diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs index 668240ab42b..36818020569 100644 --- a/src/librustc/mir/mod.rs +++ b/src/librustc/mir/mod.rs @@ -189,7 +189,7 @@ impl<'tcx> Body<'tcx> { ) -> Self { // We need `arg_count` locals, and one for the return place. assert!( - local_decls.len() >= arg_count + 1, + local_decls.len() > arg_count, "expected at least {} locals, got {}", arg_count + 1, local_decls.len() |