Bikeshed pgrx::mem to pgrx::memcx

pgcentralfoundation · Dec 6, 2023 · dd422ae · dd422ae
1 parent 556d2dc
commit dd422ae
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/pgrx/src/fn_call.rs b/pgrx/src/fn_call.rs
@@ -13,7 +13,7 @@ use pgrx_pg_sys::ffi::pg_guard_ffi_boundary;
 use pgrx_pg_sys::PgTryBuilder;
 use std::panic::AssertUnwindSafe;
 
-use crate::mem;
+use crate::memcx;
 use crate::pg_catalog::pg_proc::{PgProc, ProArgMode, ProKind};
 use crate::seal::Sealed;
 use crate::{
@@ -333,7 +333,7 @@ fn lookup_fn(fname: &str, args: &[&dyn FnCallArg]) -> Result<pg_sys::Oid> {
     // function following the normal SEARCH_PATH rules, ensuring its argument type Oids
     // exactly match the ones from the user's input arguments.  It does not evaluate the
     // return type, so we'll have to do that later
-    mem::current_context(|mcx| {
+    memcx::current_context(|mcx| {
         let mut parts_list = List::<*mut std::ffi::c_void>::default();
         let result = PgTryBuilder::new(AssertUnwindSafe(|| unsafe {
             let arg_types = args.iter().map(|a| a.type_oid()).collect::<Vec<_>>();
@@ -439,7 +439,7 @@ fn create_default_value(pg_proc: &PgProc, argnum: usize) -> Result<Option<pg_sys
     }
 
     let default_argnum = argnum - non_default_args_cnt;
-    let node = mem::current_context(|mcx| {
+    let node = memcx::current_context(|mcx| {
         let default_value_tree =
             pg_proc.proargdefaults(mcx).ok_or(FnCallError::NoDefaultArguments)?;
         default_value_tree

diff --git a/pgrx/src/lib.rs b/pgrx/src/lib.rs
@@ -62,7 +62,7 @@ pub mod itemptr;
 pub mod iter;
 pub mod list;
 pub mod lwlock;
-pub mod mem;
+pub mod memcx;
 pub mod memcxt;
 pub mod misc;
 #[cfg(feature = "cshim")]

diff --git a/pgrx/src/list.rs b/pgrx/src/list.rs
@@ -12,7 +12,7 @@
 //! It functions similarly to a Rust [`Vec`], including iterator support, but provides separate
 //! understandings of [`List`][crate::pg_sys::List]s of [`pg_sys::Oid`]s, Integers, and Pointers.
 
-use crate::mem::MemCx;
+use crate::memcx::MemCx;
 use crate::pg_sys;
 use crate::seal::Sealed;
 use core::marker::PhantomData;

diff --git a/pgrx/src/list/flat_list.rs b/pgrx/src/list/flat_list.rs
@@ -1,5 +1,5 @@
 use super::{Enlist, List, ListCell, ListHead};
-use crate::mem::MemCx;
+use crate::memcx::MemCx;
 use crate::pg_sys;
 use crate::seal::Sealed;
 use core::cmp;

diff --git a/pgrx/src/mem.rs → pgrx/src/memcx.rs b/pgrx/src/mem.rs → pgrx/src/memcx.rs
diff --git a/pgrx/src/pg_catalog/pg_proc.rs b/pgrx/src/pg_catalog/pg_proc.rs
@@ -8,7 +8,7 @@
 //LICENSE
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 use crate::list::List;
-use crate::mem::MemCx;
+use crate::memcx::MemCx;
 use crate::{pg_sys, FromDatum, IntoDatum};
 use std::ptr::NonNull;
 

diff --git a/pgrx/src/pg_sys.rs b/pgrx/src/pg_sys.rs
@@ -1,7 +1,7 @@
 //! dirty hacks
 
 // Flatten out the contents into here.
-use crate::mem;
+use crate::memcx;
 pub use pgrx_pg_sys::*;
 
 // Interposing here can allow extensions like ZomboDB to skip the cshim,
@@ -15,7 +15,7 @@ pub use pgrx_pg_sys::*;
 */
 #[inline]
 pub unsafe fn rt_fetch(index: Index, range_table: *mut List) -> *mut RangeTblEntry {
-    mem::current_context(|cx| {
+    memcx::current_context(|cx| {
         crate::list::List::<*mut core::ffi::c_void>::downcast_ptr_in_memcx(range_table, cx)
             .expect("rt_fetch used on non-ptr List")
             .get((index - 1) as _)