Merge branch 'develop' of github.com:tcdi/pgx into develop

pgcentralfoundation · May 26, 2023 · 4ba1edc · 4ba1edc
2 parents e44c20a + 1f2e458
commit 4ba1edc
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-pgrx/Cargo.toml b/cargo-pgrx/Cargo.toml
@@ -25,21 +25,21 @@ env_proxy = "0.4.1"
 num_cpus = "1.15.0"
 pgrx-pg-config = { path = "../pgrx-pg-config", version = "=0.8.4" }
 pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.8.4" }
-prettyplease = "0.1.25"
-proc-macro2 = { version = "1.0.58", features = [ "span-locations" ] }
-quote = "1.0.27"
+prettyplease = "0.2.6"
+proc-macro2 = { version = "1.0.59", features = [ "span-locations" ] }
+quote = "1.0.28"
 rayon = "1.7.0"
-regex = "1.8.2"
+regex = "1.8.3"
 ureq = "2.6.2"
 url = "2.3.1"
 serde = { version = "1.0.163", features = [ "derive" ] }
 serde_derive = "1.0.163"
 serde-xml-rs = "0.6.0"
-syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
+syn = { version = "2.0.18", features = [ "extra-traits", "full", "fold", "parsing" ] }
 unescape = "0.1.0"
 fork = "0.1.21"
-libloading = "0.7.4"
-object = "0.30.3"
+libloading = "0.8.0"
+object = "0.31.1"
 once_cell = "1.17.1"
 eyre = "0.6.8"
 color-eyre = "0.6.2"

diff --git a/pgrx-macros/Cargo.toml b/pgrx-macros/Cargo.toml
@@ -22,8 +22,8 @@ no-schema-generation = ["pgrx-sql-entity-graph/no-schema-generation"]
 
 [dependencies]
 pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.8.4" }
-proc-macro2 = "1.0.58"
-quote = "1.0.27"
+proc-macro2 = "1.0.59"
+quote = "1.0.28"
 syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
 
 [dev-dependencies]

diff --git a/pgrx-pg-config/Cargo.toml b/pgrx-pg-config/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dirs = "4.0.0"
+dirs = "5.0.1"
 eyre = "0.6.8"
 pathsearch = "0.2.0"
 owo-colors = "3.5.0"

diff --git a/pgrx-pg-sys/Cargo.toml b/pgrx-pg-sys/Cargo.toml
@@ -28,7 +28,7 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-memoffset = "0.8.0"
+memoffset = "0.9.0"
 pgrx-macros = { path = "../pgrx-macros/", version = "=0.8.4" }
 pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph/", version = "=0.8.4" }
 serde = { version = "1.0.163", features = [ "derive" ] } # impls on pub types
@@ -37,10 +37,10 @@ sptr = "0.3"
 libc = "0.2"
 
 [build-dependencies]
-bindgen = { version = "0.60.1", default-features = false, features = ["runtime"] }
+bindgen = { version = "0.65.1", default-features = false, features = ["runtime"] }
 pgrx-pg-config= { path = "../pgrx-pg-config/", version = "=0.8.4" }
-proc-macro2 = "1.0.58"
-quote = "1.0.27"
+proc-macro2 = "1.0.59"
+quote = "1.0.28"
 syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
 eyre = "0.6.8"
 shlex = "1.1.0" # shell lexing, also used by many of our deps

diff --git a/pgrx-pg-sys/build.rs b/pgrx-pg-sys/build.rs
@@ -738,7 +738,7 @@ fn run_bindgen(
         // Missing on some systems, despite being in their headers.
         .blocklist_function("inet_net_pton.*")
         .size_t_is_usize(true)
-        .rustfmt_bindings(false)
+        .formatter(bindgen::Formatter::None)
         .derive_debug(true)
         .derive_copy(true) // necessary to avoid __BindgenUnionField usages -- I don't understand why?
         .derive_default(true)

diff --git a/pgrx-sql-entity-graph/Cargo.toml b/pgrx-sql-entity-graph/Cargo.toml
@@ -18,8 +18,8 @@ no-schema-generation = []
 convert_case = "0.6.0"
 eyre = "0.6.8"
 petgraph = "0.6.3"
-proc-macro2 = { version = "1.0.58", features = [ "span-locations" ] }
-quote = "1.0.27"
+proc-macro2 = { version = "1.0.59", features = [ "span-locations" ] }
+quote = "1.0.28"
 syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
 unescape = "0.1.0"
 

diff --git a/pgrx-tests/Cargo.toml b/pgrx-tests/Cargo.toml
@@ -40,10 +40,10 @@ libc = "0.2.144"
 pgrx-macros = { path = "../pgrx-macros", version = "=0.8.4" }
 pgrx-pg-config = { path = "../pgrx-pg-config", version = "=0.8.4" }
 postgres = "0.19.5"
-regex = "1.8.2"
+regex = "1.8.3"
 serde = "1.0.163"
 serde_json = "1.0.96"
-sysinfo = "0.28.4"
+sysinfo = "0.29.0"
 eyre = "0.6.8"
 thiserror = "1.0"
 

diff --git a/pgrx/Cargo.toml b/pgrx/Cargo.toml
@@ -48,7 +48,7 @@ thiserror = "1.0"
 
 # exposed in public API
 atomic-traits = "0.3.0" # PgAtomic and shmem init
-bitflags = "1.3.2" # BackgroundWorker
+bitflags = "2.3.1" # BackgroundWorker
 bitvec = "1.0" # processing array nullbitmaps
 heapless = "0.7.16" # shmem and PgLwLock
 libc = "0.2.144" # FFI type compat

diff --git a/upgrade-deps.sh b/upgrade-deps.sh
@@ -10,15 +10,15 @@
 
 # requires:  "cargo install cargo-edit" from https://github.com/killercup/cargo-edit
 cargo update
-cargo upgrade
+cargo upgrade --incompatible --exclude syn
 cargo generate-lockfile
 
 # examples are their own independent crates, so we have to do them individually.
 for folder in pgrx-examples/*; do
     if [ -d "$folder" ]; then
         cd $folder
         cargo update
-        cargo upgrade
+        cargo upgrade --incompatible --exclude syn
         cargo generate-lockfile
         cargo check
         cd -