Rename to then_some and then

Author: varkor

src/libcore/bool.rs

@@ -9,12 +9,12 @@ impl bool {
     /// ```
     /// #![feature(bool_to_option)]
     ///
-    /// assert_eq!(false.to_option(0), None);
-    /// assert_eq!(true.to_option(0), Some(0));
+    /// assert_eq!(false.then_some(0), None);
+    /// assert_eq!(true.then_some(0), Some(0));
     /// ```
     #[unstable(feature = "bool_to_option", issue = "64260")]
     #[inline]
-    pub fn to_option<T>(self, t: T) -> Option<T> {
+    pub fn then_some<T>(self, t: T) -> Option<T> {
         if self {
             Some(t)
         } else {
@@ -29,12 +29,12 @@ impl bool {
     /// ```
     /// #![feature(bool_to_option)]
     ///
-    /// assert_eq!(false.to_option_with(|| 0), None);
-    /// assert_eq!(true.to_option_with(|| 0), Some(0));
+    /// assert_eq!(false.then(|| 0), None);
+    /// assert_eq!(true.then(|| 0), Some(0));
     /// ```
     #[unstable(feature = "bool_to_option", issue = "64260")]
     #[inline]
-    pub fn to_option_with<T, F: FnOnce() -> T>(self, f: F) -> Option<T> {
+    pub fn then<T, F: FnOnce() -> T>(self, f: F) -> Option<T> {
         if self {
             Some(f())
         } else {

src/libcore/tests/bool.rs

@@ -1,7 +1,7 @@
 #[test]
 fn test_bool_to_option() {
-    assert_eq!(false.to_option(0), None);
-    assert_eq!(true.to_option(0), Some(0));
-    assert_eq!(false.to_option_with(|| 0), None);
-    assert_eq!(true.to_option_with(|| 0), Some(0));
+    assert_eq!(false.then_some(0), None);
+    assert_eq!(true.then_some(0), Some(0));
+    assert_eq!(false.then(|| 0), None);
+    assert_eq!(true.then(|| 0), Some(0));
 }

src/libfmt_macros/lib.rs

@@ -645,7 +645,7 @@ impl<'a> Parser<'a> {
                 break;
             }
         }
-        found.to_option(cur)
+        found.then_some(cur)
     }
 }
 

src/librustc/hir/map/blocks.rs

@@ -147,7 +147,7 @@ impl<'a> FnLikeNode<'a> {
             map::Node::Expr(e) => e.is_fn_like(),
             _ => false
         };
-        fn_like.to_option(FnLikeNode { node })
+        fn_like.then_some(FnLikeNode { node })
     }
 
     pub fn body(self) -> ast::BodyId {

src/librustc/infer/outlives/verify.rs

@@ -211,7 +211,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
                 (r, p)
             );
             let p_ty = p.to_ty(tcx);
-            compare_ty(p_ty).to_option(ty::OutlivesPredicate(p_ty, r))
+            compare_ty(p_ty).then_some(ty::OutlivesPredicate(p_ty, r))
         });
 
         param_bounds

src/librustc/traits/error_reporting.rs

@@ -363,7 +363,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
             return None
         };
 
-        tcx.has_attr(impl_def_id, sym::rustc_on_unimplemented).to_option(impl_def_id)
+        tcx.has_attr(impl_def_id, sym::rustc_on_unimplemented).then_some(impl_def_id)
     }
 
     fn describe_generator(&self, body_id: hir::BodyId) -> Option<&'static str> {

src/librustc/ty/mod.rs

@@ -2784,7 +2784,7 @@ impl<'tcx> TyCtxt<'tcx> {
             }
         };
 
-        is_associated_item.to_option_with(|| self.associated_item(def_id))
+        is_associated_item.then(|| self.associated_item(def_id))
     }
 
     fn associated_item_from_trait_item_ref(self,
@@ -3249,7 +3249,7 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ParamEnv<'_> {
     let unnormalized_env = ty::ParamEnv::new(
         tcx.intern_predicates(&predicates),
         traits::Reveal::UserFacing,
-        tcx.sess.opts.debugging_opts.chalk.to_option(def_id),
+        tcx.sess.opts.debugging_opts.chalk.then_some(def_id),
     );
 
     let body_id = tcx.hir().as_local_hir_id(def_id).map_or(hir::DUMMY_HIR_ID, |id| {

src/librustc/ty/query/job.rs

@@ -303,7 +303,7 @@ fn connected_to_root<'tcx>(
         return true;
     }
 
-    visit_waiters(query, |_, successor| connected_to_root(successor, visited).to_option(None))
+    visit_waiters(query, |_, successor| connected_to_root(successor, visited).then_some(None))
         .is_some()
 }
 

src/librustc_codegen_llvm/common.rs

@@ -245,7 +245,7 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> {
             let (mut lo, mut hi) = (0u64, 0u64);
             let success = llvm::LLVMRustConstInt128Get(v, sign_ext,
                                                         &mut hi, &mut lo);
-            success.to_option(hi_lo_to_u128(lo, hi))
+            success.then_some(hi_lo_to_u128(lo, hi))
         })
     }
 

src/librustc_codegen_ssa/back/rpath.rs

@@ -119,7 +119,7 @@ fn path_relative_from(path: &Path, base: &Path) -> Option<PathBuf> {
     use std::path::Component;
 
     if path.is_absolute() != base.is_absolute() {
-        path.is_absolute().to_option_with(|| PathBuf::from(path))
+        path.is_absolute().then(|| PathBuf::from(path))
     } else {
         let mut ita = path.components();
         let mut itb = base.components();