Skip to content

Commit a4c8ab2

Browse files
authored
Bump to 0.6.0. (#70)
1 parent ea50fa4 commit a4c8ab2

File tree

22 files changed

+122
-104
lines changed

22 files changed

+122
-104
lines changed

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ members = [
2626
]
2727

2828
[workspace.package]
29+
version = "0.6.0"
2930
authors = ["PHPER Framework Team", "jmjoy <[email protected]>"]
3031
edition = "2021"
3132
license = "MulanPSL-2.0"
3233
repository = "https://github.com/jmjoy/phper.git"
33-
rust-version = "1.64"
34+
rust-version = "1.65"

examples/hello/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
[package]
1212
name = "hello"
1313
version = "0.0.0"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
publish = false
18-
license.workspace = true
18+
license = { workspace = true }
1919

2020
[lib]
2121
crate-type = ["lib", "cdylib"]
2222

2323
[dependencies]
24-
phper = { version = "0.5.1", path = "../../phper" }
24+
phper = { version = "0.6.0", path = "../../phper" }
2525

2626
[dev-dependencies]
27-
phper-test = { version = "0.5.1", path = "../../phper-test" }
27+
phper-test = { version = "0.6.0", path = "../../phper-test" }
2828

2929
[build-dependencies]
30-
phper-build = { version = "0.5.1", path = "../../phper-build" }
30+
phper-build = { version = "0.6.0", path = "../../phper-build" }

examples/http-client/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
[package]
1212
name = "http-client"
1313
version = "0.0.0"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
publish = false
18-
license.workspace = true
18+
license = { workspace = true }
1919

2020
[lib]
2121
crate-type = ["lib", "cdylib"]
2222

2323
[dependencies]
24-
anyhow = "1.0.65"
25-
bytes = "1.2.1"
26-
indexmap = "1.9.1"
27-
phper = { version = "0.5.1", path = "../../phper" }
28-
reqwest = { version = "0.11.12", features = ["blocking", "cookies"] }
24+
anyhow = "1.0.66"
25+
bytes = "1.3.0"
26+
indexmap = "1.9.2"
27+
phper = { version = "0.6.0", path = "../../phper" }
28+
reqwest = { version = "0.11.13", features = ["blocking", "cookies"] }
2929
thiserror = "1.0.37"
3030

3131
[dev-dependencies]
32-
phper-test = { version = "0.5.1", path = "../../phper-test" }
32+
phper-test = { version = "0.6.0", path = "../../phper-test" }

examples/http-server/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
[package]
1212
name = "http-server"
1313
version = "0.0.0"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
publish = false
18-
license.workspace = true
18+
license = { workspace = true }
1919

2020
[lib]
2121
crate-type = ["lib", "cdylib"]
2222

2323
[dependencies]
24-
hyper = { version = "0.14.20", features = ["http1", "runtime", "server"] }
25-
phper = { version = "0.5.1", path = "../../phper" }
24+
hyper = { version = "0.14.23", features = ["http1", "runtime", "server"] }
25+
phper = { version = "0.6.0", path = "../../phper" }
2626
thiserror = "1.0.37"
27-
tokio = { version = "1.21.2", features = ["full"] }
27+
tokio = { version = "1.22.0", features = ["full"] }
2828

2929
[dev-dependencies]
30-
phper-test = { version = "0.5.1", path = "../../phper-test" }
31-
reqwest = "0.11.12"
30+
phper-test = { version = "0.6.0", path = "../../phper-test" }
31+
reqwest = "0.11.13"

examples/logging/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
[package]
1212
name = "logging"
1313
version = "0.0.0"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
publish = false
18-
license.workspace = true
18+
license = { workspace = true }
1919

2020
[lib]
2121
crate-type = ["lib", "cdylib"]
2222

2323
[dependencies]
24-
anyhow = "1.0.65"
25-
phper = { version = "0.5.1", path = "../../phper" }
24+
anyhow = "1.0.66"
25+
phper = { version = "0.6.0", path = "../../phper" }
2626

2727
[dev-dependencies]
28-
phper-test = { version = "0.5.1", path = "../../phper-test" }
28+
phper-test = { version = "0.6.0", path = "../../phper-test" }
2929

3030
[build-dependencies]
31-
phper-build = { version = "0.5.1", path = "../../phper-build" }
31+
phper-build = { version = "0.6.0", path = "../../phper-build" }

phper-alloc/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010

1111
[package]
1212
name = "phper-alloc"
13-
version = "0.5.1"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
13+
version = { workspace = true }
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
description = "Alloc related items for phper crate."
18-
repository.workspace = true
19-
license.workspace = true
18+
repository = { workspace = true }
19+
license = { workspace = true }
2020
keywords = ["php", "alloc"]
2121

2222
[dependencies]
23-
phper-sys = { version = "0.5.1", path = "../phper-sys" }
23+
phper-sys = { version = "0.6.0", path = "../phper-sys" }
2424

2525
[build-dependencies]
26-
phper-build = { version = "0.5.1", path = "../phper-build" }
26+
phper-build = { version = "0.6.0", path = "../phper-build" }

phper-alloc/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ impl<T> EBox<T> {
3636
/// # Panic
3737
///
3838
/// Panic if `size_of::<T>()` equals zero.
39+
#[allow(clippy::useless_conversion)]
3940
pub fn new(x: T) -> Self {
4041
unsafe {
4142
assert_ne!(size_of::<T>(), 0);

phper-build/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
[package]
1212
name = "phper-build"
13-
version = "0.5.1"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
13+
version = { workspace = true }
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
description = "Generates stubs for project using phper."
18-
repository.workspace = true
19-
license.workspace = true
18+
repository = { workspace = true }
19+
license = { workspace = true }
2020
keywords = ["php", "binding"]
2121

2222
[dependencies]
23-
phper-sys = { version = "0.5.1", path = "../phper-sys" }
23+
phper-sys = { version = "0.6.0", path = "../phper-sys" }

phper-macros/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010

1111
[package]
1212
name = "phper-macros"
13-
version = "0.5.1"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
13+
version = { workspace = true }
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
description = "The proc-macros for phper crate."
18-
repository.workspace = true
19-
license.workspace = true
18+
repository = { workspace = true }
19+
license = { workspace = true }
2020
keywords = ["php", "proc-macro"]
2121

2222
[lib]
2323
proc-macro = true
2424

2525
[dependencies]
2626
quote = "1.0.21"
27-
syn = { version = "1.0.101", features = ["full"] }
28-
proc-macro2 = "1.0.44"
27+
syn = { version = "1.0.103", features = ["full"] }
28+
proc-macro2 = "1.0.47"
2929

3030
[dev-dependencies]
31-
syn = { version = "1.0.101", features = ["full", "extra-traits"] }
31+
syn = { version = "1.0.103", features = ["full", "extra-traits"] }

phper-sys/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
[package]
1212
name = "phper-sys"
13-
version = "0.5.1"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
13+
version = { workspace = true }
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
description = "Low level PHP binding for Rust."
18-
repository.workspace = true
19-
license.workspace = true
18+
repository = { workspace = true }
19+
license = { workspace = true }
2020
keywords = ["php", "binding"]
2121

2222
[build-dependencies]
23-
bindgen = "0.60.1"
24-
cc = "1.0.73"
23+
bindgen = "0.63.0"
24+
cc = "1.0.77"

phper-test/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010

1111
[package]
1212
name = "phper-test"
13-
version = "0.5.1"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
13+
version = { workspace = true }
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
description = "PHPer testing utilities."
18-
repository.workspace = true
19-
license.workspace = true
18+
repository = { workspace = true }
19+
license = { workspace = true }
2020
keywords = ["php", "binding"]
2121

2222
[features]
2323
fpm = ["fastcgi-client", "tokio/full"]
2424

2525
[dependencies]
2626
fastcgi-client = { version = "0.8.0", optional = true }
27-
libc = "0.2.133"
28-
once_cell = "1.15.0"
29-
phper-macros = { version = "0.5.1", path = "../phper-macros" }
27+
libc = "0.2.137"
28+
once_cell = "1.16.0"
29+
phper-macros = { version = "0.6.0", path = "../phper-macros" }
3030
tempfile = "3.3.0"
31-
tokio = { version = "1.21.2", optional = true }
31+
tokio = { version = "1.22.0", optional = true }
3232

3333
[package.metadata.docs.rs]
3434
rustdoc-args = ["--cfg", "docsrs"]

phper/Cargo.toml

+15-15
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@
1010

1111
[package]
1212
name = "phper"
13-
version = "0.5.1"
14-
authors.workspace = true
15-
edition.workspace = true
16-
rust-version.workspace = true
13+
version = { workspace = true }
14+
authors = { workspace = true }
15+
edition = { workspace = true }
16+
rust-version = { workspace = true }
1717
description = "The framework that allows us to write PHP extensions using pure and safe Rust whenever possible."
18-
repository.workspace = true
18+
repository = { workspace = true }
1919
documentation = "https://docs.rs/phper"
20-
license.workspace = true
20+
license = { workspace = true }
2121
readme = "README.md"
2222
keywords = ["php", "binding", "extension", "module"]
2323

2424
[dependencies]
25-
anyhow = "1.0.65"
26-
clap = { version = "3.2.22", features = ["derive"] }
25+
anyhow = "1.0.66"
26+
clap = { version = "4.0.27", features = ["derive"] }
2727
dashmap = "5.4.0"
2828
derive_more = "0.99.17"
29-
indexmap = "1.9.1"
30-
once_cell = "1.15.0"
31-
phper-alloc = { version = "0.5.1", path = "../phper-alloc" }
32-
phper-macros = { version = "0.5.1", path = "../phper-macros" }
33-
phper-sys = { version = "0.5.1", path = "../phper-sys" }
29+
indexmap = "1.9.2"
30+
once_cell = "1.16.0"
31+
phper-alloc = { version = "0.6.0", path = "../phper-alloc" }
32+
phper-macros = { version = "0.6.0", path = "../phper-macros" }
33+
phper-sys = { version = "0.6.0", path = "../phper-sys" }
3434
thiserror = "1.0.37"
3535

3636
[build-dependencies]
37-
phper-build = { version = "0.5.1", path = "../phper-build" }
38-
phper-sys = { version = "0.5.1", path = "../phper-sys" }
37+
phper-build = { version = "0.6.0", path = "../phper-build" }
38+
phper-sys = { version = "0.6.0", path = "../phper-sys" }

phper/src/arrays.rs

+4
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ impl ZArr {
110110
}
111111

112112
/// Add or update item by key.
113+
#[allow(clippy::useless_conversion)]
113114
pub fn insert<'a>(&mut self, key: impl Into<InsertKey<'a>>, mut value: ZVal) {
114115
let key = key.into();
115116
let val = value.as_mut_ptr();
@@ -162,6 +163,7 @@ impl ZArr {
162163
self.inner_get(key)
163164
}
164165

166+
#[allow(clippy::useless_conversion)]
165167
fn inner_get<'a>(&self, key: impl Into<Key<'a>>) -> Option<&'a mut ZVal> {
166168
let key = key.into();
167169
let ptr = self.as_ptr() as *mut _;
@@ -190,6 +192,7 @@ impl ZArr {
190192
}
191193
}
192194

195+
#[allow(clippy::useless_conversion)]
193196
pub fn exists<'a>(&self, key: impl Into<Key<'a>>) -> bool {
194197
let key = key.into();
195198
let ptr = self.as_ptr() as *mut _;
@@ -215,6 +218,7 @@ impl ZArr {
215218
}
216219
}
217220

221+
#[allow(clippy::useless_conversion)]
218222
pub fn remove<'a>(&mut self, key: impl Into<Key<'a>>) -> bool {
219223
let key = key.into();
220224
unsafe {

phper/src/classes.rs

+4
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ impl ClassEntry {
253253
}
254254
}
255255

256+
#[allow(clippy::useless_conversion)]
256257
fn find_global_class_entry_ptr(name: impl AsRef<str>) -> *mut zend_class_entry {
257258
let name = name.as_ref();
258259
let name = name.to_lowercase();
@@ -283,6 +284,7 @@ impl ClassEntity {
283284
}
284285
}
285286

287+
#[allow(clippy::useless_conversion)]
286288
pub(crate) unsafe fn init(&mut self) {
287289
let mut class_ce = phper_init_class_entry_ex(
288290
self.name.as_ptr().cast(),
@@ -359,6 +361,7 @@ impl PropertyEntity {
359361
}
360362
}
361363

364+
#[allow(clippy::useless_conversion)]
362365
pub(crate) fn declare(&self, ce: *mut zend_class_entry) {
363366
let name = self.name.as_ptr().cast();
364367
let name_length = self.name.len().try_into().unwrap();
@@ -428,6 +431,7 @@ fn get_object_handlers() -> &'static zend_object_handlers {
428431
})
429432
}
430433

434+
#[allow(clippy::useless_conversion)]
431435
unsafe extern "C" fn create_object(ce: *mut zend_class_entry) -> *mut zend_object {
432436
// Alloc more memory size to store state data.
433437
let extend_object: *mut ExtendObject =

0 commit comments

Comments
 (0)