mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace let Some(..) = with .is_some()

Browse source 
Signed-off-by: wcampbell <wcampbell1995@gmail.com>
This commit is contained in:
wcampbell 2021-01-17 19:06:12 -05:00
parent edeb631ad0
commit e23acc341c
No known key found for this signature in database
GPG key ID: A040F4DAFC68FFE8
2 changed files with 2 additions and 2 deletions
compiler
rustc_ast/src/attr
mod.rs
rustc_mir/src
shim.rs

2
compiler/rustc_ast/src/attr/mod.rs
View file

@ -526,7 +526,7 @@ impl MetaItemKind {
fn list_from_tokens(tokens: TokenStream) -> Option<MetaItemKind> { fn list_from_tokens(tokens: TokenStream) -> Option<MetaItemKind> {
let mut tokens = tokens.into_trees().peekable(); let mut tokens = tokens.into_trees().peekable();
let mut result = Vec::new(); let mut result = Vec::new();
while let Some(..) = tokens.peek() { while tokens.peek().is_some() {
let item = NestedMetaItem::from_tokens(&mut tokens)?; let item = NestedMetaItem::from_tokens(&mut tokens)?;
result.push(item); result.push(item);
match tokens.next() { match tokens.next() {

2
compiler/rustc_mir/src/shim.rs
View file

@ -165,7 +165,7 @@ fn build_drop_shim<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId, ty: Option<Ty<'tcx>>)
let mut body = let mut body =
new_body(source, blocks, local_decls_for_sig(&sig, span), sig.inputs().len(), span); new_body(source, blocks, local_decls_for_sig(&sig, span), sig.inputs().len(), span);
if let Some(..) = ty { if ty.is_some() {
// The first argument (index 0), but add 1 for the return value. // The first argument (index 0), but add 1 for the return value.
let dropee_ptr = Place::from(Local::new(1 + 0)); let dropee_ptr = Place::from(Local::new(1 + 0));
if tcx.sess.opts.debugging_opts.mir_emit_retag { if tcx.sess.opts.debugging_opts.mir_emit_retag {