remove unneccessary wrapping of return value of allow_unstable(), it would always return Some(thing)

Author: matthiaskrgr

compiler/rustc_attr/src/builtin.rs

@@ -1036,21 +1036,21 @@ pub fn allow_internal_unstable<'a>(
     sess: &'a Session,
     attrs: &'a [Attribute],
 ) -> Option<impl Iterator<Item = Symbol> + 'a> {
-    allow_unstable(sess, attrs, sym::allow_internal_unstable)
+    Some(allow_unstable(sess, attrs, sym::allow_internal_unstable))
 }
 
 pub fn rustc_allow_const_fn_unstable<'a>(
     sess: &'a Session,
     attrs: &'a [Attribute],
 ) -> Option<impl Iterator<Item = Symbol> + 'a> {
-    allow_unstable(sess, attrs, sym::rustc_allow_const_fn_unstable)
+    Some(allow_unstable(sess, attrs, sym::rustc_allow_const_fn_unstable))
 }
 
 fn allow_unstable<'a>(
     sess: &'a Session,
     attrs: &'a [Attribute],
     symbol: Symbol,
-) -> Option<impl Iterator<Item = Symbol> + 'a> {
+) -> impl Iterator<Item = Symbol> + 'a {
     let attrs = sess.filter_by_name(attrs, symbol);
     let list = attrs
         .filter_map(move |attr| {
@@ -1064,7 +1064,7 @@ fn allow_unstable<'a>(
         })
         .flatten();
 
-    Some(list.into_iter().filter_map(move |it| {
+    list.into_iter().filter_map(move |it| {
         let name = it.ident().map(|ident| ident.name);
         if name.is_none() {
             sess.diagnostic().span_err(
@@ -1073,5 +1073,5 @@ fn allow_unstable<'a>(
             );
         }
         name
-    }))
+    })
 }