Rename rustpython_common::{cell -> lock}

coolreader18 · coolreader18 · commit dbbdd75b31e9 · 2020-09-26T23:39:10.000-05:00
diff --git a/common/src/borrow.rs b/common/src/borrow.rs
@@ -1,4 +1,4 @@
-use crate::cell::{
+use crate::lock::{
     MapImmutable, PyImmutableMappedMutexGuard, PyMappedMutexGuard, PyMappedRwLockReadGuard,
     PyMappedRwLockWriteGuard, PyMutexGuard, PyRwLockReadGuard, PyRwLockWriteGuard,
 };
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -1,8 +1,8 @@
 //! A crate to hold types and functions common to all rustpython components.
 
 pub mod borrow;
-pub mod cell;
 pub mod float_ops;
 pub mod hash;
+pub mod lock;
 pub mod rc;
 pub mod str;
diff --git a/common/src/lock.rs b/common/src/lock.rs
diff --git a/common/src/lock/cell_lock.rs b/common/src/lock/cell_lock.rs
diff --git a/vm/src/byteslike.rs b/vm/src/byteslike.rs
@@ -1,5 +1,5 @@
 use crate::common::borrow::{BorrowedValue, BorrowedValueMut};
-use crate::common::cell::{PyRwLockReadGuard, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::obj::objbytearray::{PyByteArray, PyByteArrayRef};
 use crate::obj::objbytes::{PyBytes, PyBytesRef};
 use crate::pyobject::PyObjectRef;
diff --git a/vm/src/dictdatatype.rs b/vm/src/dictdatatype.rs
@@ -2,7 +2,7 @@
 /// Inspired by: https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html
 /// And: https://www.youtube.com/watch?v=p33CVV29OG8
 /// And: http://code.activestate.com/recipes/578375/
-use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::obj::objstr::{PyStr, PyStrRef};
 use crate::pyobject::{BorrowValue, IdProtocol, IntoPyObject, PyObjectRef, PyResult};
 use crate::vm::VirtualMachine;
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -1,4 +1,4 @@
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 use crate::function::PyFuncArgs;
 use crate::obj::objsingletons::{PyNone, PyNoneRef};
 use crate::obj::objstr::{PyStr, PyStrRef};
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -6,7 +6,7 @@ use itertools::Itertools;
 
 use crate::builtins::builtin_isinstance;
 use crate::bytecode;
-use crate::common::cell::PyMutex;
+use crate::common::lock::PyMutex;
 use crate::exceptions::{self, ExceptionCtor, PyBaseExceptionRef};
 use crate::function::PyFuncArgs;
 use crate::obj::objasyncgenerator::PyAsyncGenWrappedValue;
diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
@@ -14,7 +14,7 @@ use crate::bytesinner::{
     ByteInnerSplitOptions, ByteInnerTranslateOptions, DecodeArgs, PyBytesInner,
 };
 use crate::byteslike::PyBytesLike;
-use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::function::{OptionalArg, OptionalOption};
 use crate::obj::objbytes::PyBytes;
 use crate::obj::objtuple::PyTupleRef;
diff --git a/vm/src/obj/objcoroinner.rs b/vm/src/obj/objcoroinner.rs
@@ -4,7 +4,7 @@ use crate::frame::{ExecutionResult, FrameRef};
 use crate::pyobject::{PyObjectRef, PyResult};
 use crate::vm::VirtualMachine;
 
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 use crossbeam_utils::atomic::AtomicCell;
 
 #[derive(Debug, PartialEq, Clone, Copy)]
diff --git a/vm/src/obj/objenumerate.rs b/vm/src/obj/objenumerate.rs
@@ -1,4 +1,4 @@
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 use std::ops::AddAssign;
 
 use num_bigint::BigInt;
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -23,7 +23,7 @@ use crate::slots::{Callable, Comparable, PyComparisonOp, SlotDescriptor, SlotGet
 use crate::VirtualMachine;
 use itertools::Itertools;
 #[cfg(feature = "jit")]
-use rustpython_common::cell::OnceCell;
+use rustpython_common::lock::OnceCell;
 #[cfg(feature = "jit")]
 use rustpython_jit::CompiledCode;
 
diff --git a/vm/src/obj/objlist.rs b/vm/src/obj/objlist.rs
@@ -14,7 +14,7 @@ use super::objsequence::{
 use super::objslice::PySliceRef;
 use super::objtype::PyTypeRef;
 use crate::bytesinner;
-use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::function::OptionalArg;
 use crate::pyobject::{
     BorrowValue, Either, PyClassImpl, PyComparisonValue, PyContext, PyIterable, PyObjectRef, PyRef,
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -1,7 +1,7 @@
 /*! Python `property` descriptor class.
 
 */
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 
 use super::objtype::PyTypeRef;
 use crate::pyobject::{
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -1,4 +1,4 @@
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 use std::collections::{HashMap, HashSet};
 use std::fmt;
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -39,7 +39,7 @@ use crate::scope::Scope;
 use crate::slots::{PyTpFlags, PyTypeSlots};
 use crate::types::{create_type_with_slots, initialize_types, TypeZoo};
 use crate::vm::VirtualMachine;
-use rustpython_common::cell::{PyRwLock, PyRwLockReadGuard};
+use rustpython_common::lock::{PyRwLock, PyRwLockReadGuard};
 use rustpython_common::rc::PyRc;
 
 pub use crate::common::borrow::BorrowValue;
diff --git a/vm/src/slots.rs b/vm/src/slots.rs
@@ -1,7 +1,7 @@
 use std::cmp::Ordering;
 
-use crate::common::cell::PyRwLock;
 use crate::common::hash::PyHash;
+use crate::common::lock::PyRwLock;
 use crate::function::{OptionalArg, PyFuncArgs, PyNativeFunc};
 use crate::obj::objstr::PyStrRef;
 use crate::pyobject::{
diff --git a/vm/src/stdlib/array.rs b/vm/src/stdlib/array.rs
@@ -1,4 +1,4 @@
-use crate::common::cell::{
+use crate::common::lock::{
     PyMappedRwLockReadGuard, PyMappedRwLockWriteGuard, PyRwLock, PyRwLockReadGuard,
     PyRwLockWriteGuard,
 };
diff --git a/vm/src/stdlib/collections.rs b/vm/src/stdlib/collections.rs
@@ -2,7 +2,7 @@ pub(crate) use _collections::make_module;
 
 #[pymodule]
 mod _collections {
-    use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+    use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
     use crate::function::OptionalArg;
     use crate::obj::{objiter, objsequence, objtype::PyTypeRef};
     use crate::pyobject::{
diff --git a/vm/src/stdlib/csv.rs b/vm/src/stdlib/csv.rs
@@ -2,7 +2,7 @@ use csv as rust_csv;
 use itertools::{self, Itertools};
 use std::fmt::{self, Debug, Formatter};
 
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 use crate::function::PyFuncArgs;
 use crate::obj::objiter;
 use crate::obj::objstr::{self, PyStr};
diff --git a/vm/src/stdlib/hashlib.rs b/vm/src/stdlib/hashlib.rs
@@ -2,7 +2,7 @@ pub(crate) use hashlib::make_module;
 
 #[pymodule]
 mod hashlib {
-    use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+    use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
     use crate::function::{OptionalArg, PyFuncArgs};
     use crate::obj::objbytes::{PyBytes, PyBytesRef};
     use crate::obj::objstr::PyStrRef;
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -18,7 +18,7 @@ mod _io {
     use std::io::{self, prelude::*, Cursor, SeekFrom};
 
     use crate::byteslike::PyBytesLike;
-    use crate::common::cell::{PyRwLock, PyRwLockWriteGuard};
+    use crate::common::lock::{PyRwLock, PyRwLockWriteGuard};
     use crate::exceptions::{IntoPyException, PyBaseExceptionRef};
     use crate::function::{Args, KwArgs, OptionalArg, OptionalOption, PyFuncArgs};
     use crate::obj::objbool;
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
@@ -8,7 +8,7 @@ mod decl {
     use std::fmt;
     use std::iter;
 
-    use crate::common::cell::{PyMutex, PyRwLock, PyRwLockWriteGuard};
+    use crate::common::lock::{PyMutex, PyRwLock, PyRwLockWriteGuard};
     use crate::common::rc::PyRc;
     use crate::function::{Args, OptionalArg, OptionalOption, PyFuncArgs};
     use crate::obj::objbool;
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -11,7 +11,7 @@ use num_traits::ToPrimitive;
 
 use super::errno::errors;
 use crate::byteslike::PyBytesLike;
-use crate::common::cell::PyRwLock;
+use crate::common::lock::PyRwLock;
 use crate::exceptions::{IntoPyException, PyBaseExceptionRef};
 use crate::function::{IntoPyNativeFunc, OptionalArg, PyFuncArgs};
 use crate::obj::objbytes::{PyBytes, PyBytesRef};
diff --git a/vm/src/stdlib/random.rs b/vm/src/stdlib/random.rs
@@ -4,7 +4,7 @@ pub(crate) use _random::make_module;
 
 #[pymodule]
 mod _random {
-    use crate::common::cell::PyMutex;
+    use crate::common::lock::PyMutex;
     use crate::function::OptionalOption;
     use crate::obj::objint::PyIntRef;
     use crate::obj::objtype::PyTypeRef;
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -1,4 +1,4 @@
-use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use std::io::{self, prelude::*};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr, ToSocketAddrs};
 use std::time::Duration;
diff --git a/vm/src/stdlib/ssl.rs b/vm/src/stdlib/ssl.rs
@@ -1,6 +1,6 @@
 use super::socket::PySocketRef;
 use crate::byteslike::PyBytesLike;
-use crate::common::cell::{PyRwLock, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLock, PyRwLockWriteGuard};
 use crate::exceptions::{IntoPyException, PyBaseExceptionRef};
 use crate::function::OptionalArg;
 use crate::obj::objbytearray::PyByteArrayRef;
diff --git a/vm/src/stdlib/winreg.rs b/vm/src/stdlib/winreg.rs
@@ -1,5 +1,5 @@
 #![allow(non_snake_case)]
-use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
+use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::exceptions::IntoPyException;
 use crate::function::OptionalArg;
 use crate::obj::objstr::PyStrRef;
diff --git a/vm/src/stdlib/zlib.rs b/vm/src/stdlib/zlib.rs
@@ -3,7 +3,7 @@ pub(crate) use decl::make_module;
 #[pymodule(name = "zlib")]
 mod decl {
     use crate::byteslike::PyBytesLike;
-    use crate::common::cell::PyMutex;
+    use crate::common::lock::PyMutex;
     use crate::exceptions::PyBaseExceptionRef;
     use crate::function::OptionalArg;
     use crate::obj::objbytes::{PyBytes, PyBytesRef};
diff --git a/vm/src/types.rs b/vm/src/types.rs
@@ -42,7 +42,7 @@ use crate::pyobject::{
     PyAttributes, PyClassDef, PyClassImpl, PyContext, PyObject, PyObjectRc, PyObjectRef,
 };
 use crate::slots::PyTypeSlots;
-use rustpython_common::{cell::PyRwLock, rc::PyRc};
+use rustpython_common::{lock::PyRwLock, rc::PyRc};
 use std::mem::MaybeUninit;
 use std::ptr;
 
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -19,7 +19,7 @@ use rustpython_compiler::{
 
 use crate::builtins::{self, to_ascii};
 use crate::bytecode;
-use crate::common::{cell::PyMutex, hash::HashSecret, rc::PyRc};
+use crate::common::{hash::HashSecret, lock::PyMutex, rc::PyRc};
 use crate::exceptions::{self, PyBaseException, PyBaseExceptionRef};
 use crate::frame::{ExecutionResult, Frame, FrameRef};
 use crate::frozen;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use crate::cell::{`
	`1`	`+use crate::lock::{`
`2`	`2`	`MapImmutable, PyImmutableMappedMutexGuard, PyMappedMutexGuard, PyMappedRwLockReadGuard,`
`3`	`3`	`PyMappedRwLockWriteGuard, PyMutexGuard, PyRwLockReadGuard, PyRwLockWriteGuard,`
`4`	`4`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use crate::common::cell::PyRwLock;`
	`1`	`+use crate::common::lock::PyRwLock;`
`2`	`2`	`use crate::function::PyFuncArgs;`
`3`	`3`	`use crate::obj::objsingletons::{PyNone, PyNoneRef};`
`4`	`4`	`use crate::obj::objstr::{PyStr, PyStrRef};`