bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove unwrap_none/expect_none from compiler/.

Browse source
This commit is contained in:
Mara Bos 2021-03-04 13:06:01 +01:00
parent 895a8e71b1
commit cfb4ad4f2a
10 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/ich/impls_syntax.rs
View file

@ -45,7 +45,11 @@ impl<'ctx> rustc_ast::HashStableContext for StableHashingContext<'ctx> {
item.hash_stable(self, hasher);
style.hash_stable(self, hasher);
span.hash_stable(self, hasher);
tokens.as_ref().expect_none("Tokens should have been removed during lowering!");
assert_matches!(
tokens.as_ref(),
None,
"Tokens should have been removed during lowering!"
);
} else {
unreachable!();
}

2
compiler/rustc_middle/src/lib.rs
View file

@ -24,6 +24,7 @@
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(array_windows)]
#![feature(assert_matches)]
#![feature(assoc_char_funcs)]
#![feature(backtrace)]
#![feature(bool_to_option)]
@ -38,7 +39,6 @@
#![feature(extern_types)]
#![feature(nll)]
#![feature(once_cell)]
#![feature(option_expect_none)]
#![feature(or_patterns)]
#![feature(min_specialization)]
#![feature(trusted_len)]

2
compiler/rustc_middle/src/mir/interpret/allocation.rs
View file

@ -339,7 +339,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
for dest in bytes {
*dest = src.next().expect("iterator was shorter than it said it would be");
}
src.next().expect_none("iterator was longer than it said it would be");
assert_matches!(src.next(), None, "iterator was longer than it said it would be");
Ok(())
}