Fix log::init when feature origin-thread is enabled. (#102)

`current_thread_id()` in `log::init` should be `current_id()` after
commit 0d4b978. And `current_id` is simplified to avoid redundant
checking `raw > 0`.

Author: ur4t

src/log.rs

@@ -31,6 +31,6 @@ fn init() {
     log::trace!(
         target: "origin::thread",
         "Main Thread[{:?}] initialized",
-        crate::thread::current_thread_id().as_raw_nonzero()
+        crate::thread::current_id().as_raw_nonzero()
     );
 }

src/thread/linux_raw.rs

@@ -950,19 +950,14 @@ pub fn current() -> Thread {
 #[inline]
 #[must_use]
 pub fn current_id() -> ThreadId {
+    // Don't use the `id` function here because it returns an `Option` to
+    // handle the case where the thread has exited. We're querying the current
+    // thread which we know is still running because we're on it.
     // SAFETY: All threads have been initialized, including the main thread
     // with `initialize_main`, so `current()` returns a valid pointer.
-    unsafe {
-        // Don't use the `thread_id` function here because it returns an
-        // `Option` to handle the case where the thread has exited. We're
-        // querying the current thread which we know is still running because
-        // we're on it.
-        let raw = current().0.as_ref().thread_id.load(SeqCst);
-        debug_assert!(raw > 0);
-        let tid = ThreadId::from_raw_unchecked(raw);
-        debug_assert_eq!(tid, gettid(), "`current_id` disagrees with `gettid`");
-        tid
-    }
+    let tid = unsafe { ThreadId::from_raw_unchecked(current().0.as_ref().thread_id.load(SeqCst)) };
+    debug_assert_eq!(tid, gettid(), "`current_id` disagrees with `gettid`");
+    tid
 }
 
 /// Set the current thread id, after a `fork`.