[temp] use new name 'from_env_ext' for new behavior

Author: belovdv

src/lib.rs

@@ -29,8 +29,8 @@
 //!
 //! // See API documentation for why this is `unsafe`
 //! let client = match unsafe { Client::from_env() } {
-//!     Ok(client) => client,
-//!     Err(_) => panic!("client not configured"),
+//!     Some(client) => client,
+//!     None => panic!("client not configured"),
 //! };
 //! ```
 //!
@@ -269,7 +269,7 @@ impl Client {
     ///
     /// Note, though, that on Windows it should be safe to call this function
     /// any number of times.
-    pub unsafe fn from_env() -> Result<Client, ErrFromEnv> {
+    pub unsafe fn from_env_ext() -> Result<Client, ErrFromEnv> {
         let (env, var) = ["CARGO_MAKEFLAGS", "MAKEFLAGS", "MFLAGS"]
             .iter()
             .map(|&env| env::var(env).map(|var| (env, var)))
@@ -289,6 +289,14 @@ impl Client {
         }
     }
 
+    /// Attempts to connect to the jobserver specified in this process's
+    /// environment.
+    ///
+    /// Wraps `from_env_ext` and discards error details.
+    pub unsafe fn from_env() -> Option<Client> {
+        Self::from_env_ext().ok()
+    }
+
     /// Acquires a token from this jobserver client.
     ///
     /// This function will block the calling thread until a new token can be

tests/client.rs

@@ -35,23 +35,23 @@ const TESTS: &[Test] = &[
         make_args: &[],
         rule: &|me| me.to_string(),
         f: &|| {
-            assert!(unsafe { Client::from_env().is_err() });
+            assert!(unsafe { Client::from_env().is_none() });
         },
     },
     Test {
         name: "no j args with plus",
         make_args: &[],
         rule: &|me| format!("+{}", me),
         f: &|| {
-            assert!(unsafe { Client::from_env().is_err() });
+            assert!(unsafe { Client::from_env().is_none() });
         },
     },
     Test {
         name: "j args with plus",
         make_args: &["-j2"],
         rule: &|me| format!("+{}", me),
         f: &|| {
-            assert!(unsafe { Client::from_env().is_ok() });
+            assert!(unsafe { Client::from_env().is_some() });
         },
     },
     Test {