Fix clippy/wasm errors

coolreader18 · coolreader18 · commit 1d6b32ca983a · 2020-11-06T17:37:50.000-06:00
diff --git a/common/src/lock/cell_lock.rs b/common/src/lock/cell_lock.rs
@@ -200,8 +200,8 @@ fn deadlock(lockkind: &str, ty: &str) -> ! {
 }
 
 pub struct SingleThreadId(());
-impl GetThreadId for SingleThreadId {
-    pub const INIT: Self = SingleThreadId(());
+unsafe impl GetThreadId for SingleThreadId {
+    const INIT: Self = SingleThreadId(());
     fn nonzero_thread_id(&self) -> NonZeroUsize {
         NonZeroUsize::new(1).unwrap()
     }
diff --git a/common/src/lock/thread_mutex.rs b/common/src/lock/thread_mutex.rs
@@ -17,6 +17,7 @@ pub struct RawThreadMutex<R: RawMutex, G: GetThreadId> {
 }
 
 impl<R: RawMutex, G: GetThreadId> RawThreadMutex<R, G> {
+    #[allow(clippy::declare_interior_mutable_const)]
     pub const INIT: Self = RawThreadMutex {
         owner: AtomicUsize::new(0),
         mutex: R::INIT,
@@ -53,6 +54,12 @@ impl<R: RawMutex, G: GetThreadId> RawThreadMutex<R, G> {
         self.lock_internal(|| self.mutex.try_lock())
     }
 
+    /// Unlocks this mutex. The inner mutex may not be unlocked if
+    /// this mutex was acquired previously in the current thread.
+    ///
+    /// # Safety
+    ///
+    /// This method may only be called if the mutex is held by the current thread.
     pub unsafe fn unlock(&self) {
         self.owner.store(0, Ordering::Relaxed);
         self.mutex.unlock();
diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs
@@ -60,7 +60,7 @@ impl PyValue for PyType {
 }
 
 impl PyType {
-    pub fn tp_name<'s>(&'s self) -> PyMappedRwLockReadGuard<'s, str> {
+    pub fn tp_name(&self) -> PyMappedRwLockReadGuard<str> {
         let opt_name = self.slots.name.upgradable_read();
         let read_guard = if opt_name.is_some() {
             PyRwLockUpgradableReadGuard::downgrade(opt_name)
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -1,7 +1,13 @@
 /*
  * I/O core tools.
  */
-use super::os::Offset;
+cfg_if::cfg_if! {
+    if #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] {
+        use super::os::Offset;
+    } else {
+        type Offset = i64;
+    }
+}
 use crate::pyobject::PyObjectRef;
 use crate::VirtualMachine;
 pub(crate) use _io::io_open as open;
@@ -2788,7 +2794,7 @@ mod fileio {
             flags |= libc::O_CLOEXEC
         }
 
-        Ok((mode, flags))
+        Ok((mode, flags as _))
     }
 
     #[pyattr]

Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,8 @@ fn deadlock(lockkind: &str, ty: &str) -> ! {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`pub struct SingleThreadId(());`
`203`		`-impl GetThreadId for SingleThreadId {`
`204`		`- pub const INIT: Self = SingleThreadId(());`
	`203`	`+unsafe impl GetThreadId for SingleThreadId {`
	`204`	`+ const INIT: Self = SingleThreadId(());`
`205`	`205`	`fn nonzero_thread_id(&self) -> NonZeroUsize {`
`206`	`206`	`NonZeroUsize::new(1).unwrap()`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ impl PyValue for PyType {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`impl PyType {`
`63`		`- pub fn tp_name<'s>(&'s self) -> PyMappedRwLockReadGuard<'s, str> {`
	`63`	`+ pub fn tp_name(&self) -> PyMappedRwLockReadGuard<str> {`
`64`	`64`	`let opt_name = self.slots.name.upgradable_read();`
`65`	`65`	`let read_guard = if opt_name.is_some() {`
`66`	`66`	`PyRwLockUpgradableReadGuard::downgrade(opt_name)`