php-literal-parser 0.2

Cargo.lock

@@ -177,9 +177,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "beef"
-version = "0.4.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474a626a67200bd107d44179bb3d4fc61891172d11696609264589be6a0e6a43"
+checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
 
 [[package]]
 name = "bitflags"
@@ -1020,18 +1020,18 @@ dependencies = [
 
 [[package]]
 name = "logos"
-version = "0.11.4"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91c49573597a5d6c094f9031617bb1fed15c0db68c81e6546d313414ce107e4"
+checksum = "427e2abca5be13136da9afdbf874e6b34ad9001dd70f2b103b083a85daa7b345"
 dependencies = [
  "logos-derive",
 ]
 
 [[package]]
 name = "logos-derive"
-version = "0.11.5"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "797b1f8a0571b331c1b47e7db245af3dc634838da7a92b3bef4e30376ae1c347"
+checksum = "56a7d287fd2ac3f75b11f19a1c8a874a7d55744bd91f7a1b3e7cf87d4343c36d"
 dependencies = [
  "beef",
  "fnv",
@@ -1435,11 +1435,13 @@ checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57"
 
 [[package]]
 name = "php-literal-parser"
-version = "0.1.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c058da0470445f37a383d3b6f8f82fe75a6c4cc8804a5900f6d9a415d92053"
+checksum = "21db8e3f55bc1fcc0957df149a1974bc6743a5ec625cc64d8a72753e064d00c8"
 dependencies = [
  "logos",
+ "memchr",
+ "serde",
  "source-span",
  "thiserror",
 ]

Cargo.toml

@@ -21,7 +21,7 @@ color-eyre = "0.5"
 smallvec = "1.5.0"
 reqwest = { version = "0.11.0", default-features = false, features = ["rustls-tls", "json"] }
 warp-real-ip = "0.2"
-php-literal-parser = "0.1"
+php-literal-parser = "0.2"
 parse-display = "0.4"
 percent-encoding = "2.1.0"
 rand = "0.7.3"

src/config.rs

@@ -37,7 +37,7 @@ impl Config {
         let content = std::fs::read_to_string(path)
             .wrap_err_with(|| format!("Failed to read config file {}", path))?;
         let literal = content.trim_start_matches("<?php\n$CONFIG =").to_string();
-        let parsed = php_literal_parser::parse(&literal)
+        let parsed = php_literal_parser::from_str(&literal)
             .map_err(|err| Report::msg(err.to_string()))
             .wrap_err("Failed to parse config file")?;