Merge branch 'main' into pr_print

Kampfkarren · Oct 9, 2024 · eadb1ea · eadb1ea
2 parents 3cfe861 + b5020b5
commit eadb1ea
Show file tree

Hide file tree

Showing 14 changed files with 533 additions and 193 deletions.
diff --git a/full-moon/Cargo.toml b/full-moon/Cargo.toml
@@ -11,9 +11,9 @@ keywords = ["lua", "parser", "lua51", "lua52", "luau"]
 edition = "2021"
 
 [package.metadata.docs.rs]
-# Build Locally: RUSTDOCFLAGS="--cfg doc_cfg" cargo +nightly doc --features luau,lua52,lua53,lua54,luajit  --no-deps --open
+# Build Locally: RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --features luau,lua52,lua53,lua54,luajit  --no-deps --open
 features = ["luau", "lua52", "lua53", "lua54", "luajit"]
-rustdoc-args = ["--cfg", "doc_cfg"]
+rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = ["serde"]
@@ -28,19 +28,19 @@ no-source-tests = []
 [dependencies]
 bytecount = "0.6"
 cfg-if = "1.0"
-derive_more = "0.99"
+derive_more = { version = "1.0", features = ["display"] }
 full_moon_derive = { path = "../full-moon-derive", version = "=0.11.0" }
 paste = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"], optional = true }
-smol_str = { version = "0.1.23", features = ["serde"] }
+smol_str = { version = "0.3.1", features = ["serde"] }
 
 [dev-dependencies]
 codespan = "0.11.1"
 codespan-reporting = "0.11.1"
 criterion = "0.5.1"
-insta = { version = "1.26.0", features = ["glob", "yaml"] }
-pretty_assertions = "1.3.0"
-termcolor = "1.2.0"
+insta = { version = "1.40.0", features = ["glob", "yaml"] }
+pretty_assertions = "1.4.1"
+termcolor = "1.4.1"
 
 [[bench]]
 name = "date"

diff --git a/full-moon/src/ast/lua52.rs b/full-moon/src/ast/lua52.rs
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 /// A goto statement, such as `goto label`.
 #[derive(Clone, Debug, Display, PartialEq, Eq, Node, Visit)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[display(fmt = "{goto_token}{label_name}")]
+#[display("{goto_token}{label_name}")]
 pub struct Goto {
     pub(crate) goto_token: TokenReference,
     pub(crate) label_name: TokenReference,
@@ -50,7 +50,7 @@ impl Goto {
 /// A label, such as `::label::`.
 #[derive(Clone, Debug, Display, PartialEq, Eq, Node, Visit)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[display(fmt = "{left_colons}{name}{right_colons}")]
+#[display("{left_colons}{name}{right_colons}")]
 pub struct Label {
     pub(crate) left_colons: TokenReference,
     pub(crate) name: TokenReference,

diff --git a/full-moon/src/ast/lua54.rs b/full-moon/src/ast/lua54.rs
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 /// An attribute on a local variable, `<const>` in `local x <const>`
 #[derive(Clone, Debug, Display, PartialEq, Eq, Node, Visit)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[display(fmt = "{}{}{}", "brackets.tokens().0", "name", "brackets.tokens().1")]
+#[display("{}{}{}", brackets.tokens().0, name, brackets.tokens().1)]
 pub struct Attribute {
     #[node(full_range)]
     #[visit(contains = "name")]