fix: update to Mago 1.29.0 (new bytes-based format_code API)

mago-formatter changed its API across the 1.x line:

- 1.29.0's `Formatter::format_code` now takes/returns `Cow<'static, [u8]>`
  / `&'arena [u8]` instead of `Cow<'static, str>` / `&'arena str`. Convert
  the path and source text to owned bytes before calling, and decode the
  resulting bytes back via `std::str::from_utf8` before returning.
- 1.29.0 declares `rust-version = "1.95.0"`, so bump rust-toolchain.toml
  from 1.92.0 to 1.95.0. Without a `rust-version` in our Cargo.toml,
  cargo's MSRV-aware resolver had nothing to filter against and was
  picking 1.29.0 on top of Rust 1.92 anyway — which broke CI.
- Update Cargo.toml's `mago-formatter` / `mago-php-version` pin from
  1.0.3 to 1.29.0.
- Regenerate test specs: 1.29.0 now inlines empty function/method
  bodies by default (`function foo() {}` rather than the old multi-line
  brace form), so the corresponding `.txt` specs needed refreshing.

Author: dsherret

Cargo.toml

@@ -27,8 +27,8 @@ wasm = ["serde_json", "dprint-core/wasm"]
 anyhow = "1.0.51"
 bumpalo = "3"
 dprint-core = { version = "0.67.4", default-features = false }
-mago-formatter = "1.0.3"
-mago-php-version = "1.0.3"
+mago-formatter = "1.29.0"
+mago-php-version = "1.29.0"
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.92.0"
+channel = "1.95.0"
 components = ["clippy", "rustfmt"]

src/format_text.rs

@@ -33,8 +33,12 @@ pub fn format_text(file_path: &Path, input_text: &str, config: &Configuration) -
   let settings = build_format_settings(config);
   let formatter = Formatter::new(&arena, php_version, settings);
 
-  let file_name = file_path.to_string_lossy().into_owned();
-  let formatted = formatter.format_code(Cow::Owned(file_name), Cow::Owned(input_text.to_string()))?;
+  // mago_formatter::Formatter::format_code requires Cow<'static, [u8]>,
+  // so the runtime inputs are converted to owned Vec<u8>.
+  let file_name = file_path.to_string_lossy().into_owned().into_bytes();
+  let code = input_text.as_bytes().to_vec();
+  let formatted = formatter.format_code(Cow::Owned(file_name), Cow::Owned(code))?;
+  let formatted = std::str::from_utf8(formatted)?;
 
   if formatted == input_text {
     Ok(None)

tests/specs/ClassMembers.txt

@@ -15,9 +15,7 @@ class Foo
 
     public $y;
 
-    public function bar()
-    {
-    }
+    public function bar() {}
 }
 
 == should not sort class methods (default) ==
@@ -33,15 +31,9 @@ class Foo {
 
 class Foo
 {
-    public function z()
-    {
-    }
+    public function z() {}
 
-    private function a()
-    {
-    }
+    private function a() {}
 
-    protected function m()
-    {
-    }
+    protected function m() {}
 }

tests/specs/ClassMembersSeparateFalse.txt

@@ -18,7 +18,5 @@ class Foo
 
     public $y;
 
-    public function bar()
-    {
-    }
+    public function bar() {}
 }

tests/specs/ClassMembersSortTrue.txt

@@ -12,15 +12,9 @@ class Foo {
 
 class Foo
 {
-    public function a()
-    {
-    }
+    public function a() {}
 
-    protected function m()
-    {
-    }
+    protected function m() {}
 
-    private function z()
-    {
-    }
+    private function z() {}
 }

tests/specs/EmptyBraces.txt

@@ -41,9 +41,7 @@ class Foo {
 
 class Foo
 {
-    public function bar()
-    {
-    }
+    public function bar() {}
 }
 
 == should not inline empty function braces (default) ==
@@ -53,9 +51,7 @@ function foo() {}
 [expect]
 <?php
 
-function foo()
-{
-}
+function foo() {}
 
 == should not inline empty control braces (default) ==
 <?php

tests/specs/Spacing.txt

@@ -63,6 +63,4 @@ function test(& $x) {}
 [expect]
 <?php
 
-function test(&$x)
-{
-}
+function test(&$x) {}

tests/specs/SpacingReferenceSpace.txt

@@ -6,6 +6,4 @@ function test(&$x) {}
 [expect]
 <?php
 
-function test(&$x)
-{
-}
+function test(&$x) {}