feat: release 0.6

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: cocogitto/cocogitto-action@v3.5
+      - uses: cocogitto/cocogitto-action@v3.8
         with:
           check-latest-tag-only: true
           git-user: glsl-lang
@@ -155,7 +155,7 @@ jobs:
               && cargo-workspaces -V
           )
 
-      - uses: cocogitto/cocogitto-action@v3.5
+      - uses: cocogitto/cocogitto-action@v3.8
         id: release
         # Set to true because the action fails if there's nothing to release
         continue-on-error: true

.github/workflows/docs.yml

@@ -8,7 +8,12 @@ on:
 jobs:
   release-docs:
     name: Build docs
+
     runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1

CHANGELOG.md

@@ -1,6 +1,33 @@
 ## [Unreleased]
 
 - - -
+## v0.6.0-beta.1 - 2024-08-19
+#### Bug Fixes
+- **(deps)** update rust crate derive_more to v1 - (0315528) - renovate[bot]
+- **(deps)** update all non-major dependencies - (65b144f) - renovate[bot]
+- **(glsl-lang-quote)** correctly parse #(ident) at line start - (c47f7fc) - *alixinne*
+- update github profile information - (2beea1f) - Alix Tavernier
+#### Build system
+- set resolver to 2 - (73544c2) - alixinne
+#### Features
+- rename lang_util(as) to lang_util(parser) - (1902047) - alixinne
+#### Miscellaneous Chores
+- **(cog)** allow releases on next branch - (8a47fde) - *alixinne*
+- **(deps)** update softprops/action-gh-release action to v2 - (2c27d68) - renovate[bot]
+- **(deps)** update peaceiris/actions-gh-pages action to v4 - (37d2da5) - renovate[bot]
+- **(deps)** update rust crate glsl to v7 - (e8782ee) - renovate[bot]
+- **(deps)** update actions/cache action to v4 - (76c7bd2) - renovate[bot]
+- **(deps)** update actions/checkout action to v4 - (be49ea6) - renovate[bot]
+- **(deps)** update actions/cache action to v3 - (b159bfb) - renovate[bot]
+- **(version)** v0.5.3 [skip ci] - (ef30eef) - glsl-lang
+- **(version)** v0.5.2 [skip ci] - (c0ada55) - glsl-lang
+- fix script headers - (d746dcf) - alixinne
+- fix clippy warnings - (b0ccc3f) - alixinne
+- fix clippy warnings - (c28f583) - alixinne
+- bump rust version to 1.74.0 - (23a3c9b) - alixinne
+
+- - -
+
 ## v0.5.3 - 2024-07-23
 #### Bug Fixes
 - **(glsl-lang-quote)** correctly parse #(ident) at line start - (c47f7fc) - *alixinne*

ci/bumpver.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -eux
 

ci/readme.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CHECK_MODE=0
 

ci/release.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

cog.toml

@@ -1,6 +1,7 @@
 ignore_merge_commits = true
 branch_whitelist = [
   "master",
+  "next",
 ]
 pre_bump_hooks = [
   "./ci/bumpver.sh {{version}}",

data/validate-shaders.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script validates shaders (if successfully compiled) using spirv-val.
 # It is not meant to preclude the possible addition of the validator to

fuzz/Cargo.toml

@@ -23,5 +23,5 @@ path = "src/bin/lang_test.rs"
 [dependencies]
 glsl-lang-pp = "*"
 glsl-lang = "*"
-afl = "0.11"
+afl = "0.15"
 argh = "0.1.5"

fuzz/fuzz.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

lang-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-cli"
-version = "0.5.3"
+version = "0.6.0-beta.1"
 authors = ["Alixinne <alixinne@pm.me>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -13,9 +13,9 @@ keywords = ["glsl", "language", "parser", "ast", "cli"]
 categories = ["command-line-interface", "parser-implementations", "rendering"]
 
 [dependencies]
-glsl-lang = { version = "=0.5.3", features = ["lexer-v2-full"] }
-glsl-lang-pp = { version = "=0.5.3" }
-lang-util = "=0.5.3"
+glsl-lang = { version = "=0.6.0-beta.1", features = ["lexer-v2-full"] }
+glsl-lang-pp = { version = "=0.6.0-beta.1" }
+lang-util = "=0.6.0-beta.1"
 argh = "0.1"
 
 serde_json = { version = "1.0", optional = true }

lang-lexer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-lexer"
-version = "0.5.3"
+version = "0.6.0-beta.1"
 authors = ["Alixinne <alixinne@pm.me>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -13,8 +13,8 @@ keywords = ["glsl", "language", "parser"]
 categories = ["parser-implementations", "rendering"]
 
 [dependencies]
-glsl-lang-types = "=0.5.3"
-lang-util = { version = "=0.5.3", features = ["lalrpop"] }
+glsl-lang-types = "=0.6.0-beta.1"
+lang-util = { version = "=0.6.0-beta.1", features = ["lalrpop"] }
 
 thiserror = "1.0"
 
@@ -24,7 +24,7 @@ rserde = { version = "1.0", optional = true, features = ["derive"], package = "s
 logos = { version = "0.12", optional = true }
 
 # v2 lexer dependencies
-glsl-lang-pp = { version = "=0.5.3", optional = true }
+glsl-lang-pp = { version = "=0.6.0-beta.1", optional = true }
 lalrpop-util = { version = "0.20.0", default-features = false, optional = true }
 
 [features]

lang-lexer/src/lib.rs

@@ -6,6 +6,10 @@ use lang_util::position::LexerPosition;
 pub use token::*;
 
 #[cfg(feature = "v1")]
+#[deprecated(
+    since = "0.6.0",
+    note = "the v1 lexer is not spec-compliant and relies on outdated dependencies. It will be removed in glsl-lang 0.7.0"
+)]
 pub mod v1;
 
 #[cfg(any(feature = "v2-min", feature = "v2-full"))]

lang-lexer/src/token.rs

@@ -766,9 +766,9 @@ pub enum Token {
         feature = "v1",
         regex("#\\s*\\(\\s*[a-zA-Z_][a-zA-Z_0-9]*\\s*\\)", parse_rs_ident)
     )]
-    #[lang_util(as = "ident", kind = "identifier")]
+    #[lang_util(parser = "ident", kind = "identifier")]
     Identifier(SmolStr),
-    #[lang_util(as = "ty_name", kind = "type name")]
+    #[lang_util(parser = "ty_name", kind = "type name")]
     TypeName(SmolStr), // Cast from Identifier depending on known type names
     #[cfg_attr(
         feature = "v1",
@@ -778,21 +778,21 @@ pub enum Token {
         )
     )]
     #[cfg_attr(feature = "v1", regex(r"[0-9]+[eE][+-]?[0-9]+(f|F)?", parse_f32))]
-    #[lang_util(as = "float_constant", kind = "literal")]
+    #[lang_util(parser = "float_constant", kind = "literal")]
     FloatConstant(f32),
     #[cfg_attr(feature = "v1", regex(r"0[0-7]*", |lex| parse_int(lex, 8)))]
     #[cfg_attr(feature = "v1", regex(r"[1-9][0-9]*", |lex| parse_int(lex, 10)))]
     #[cfg_attr(feature = "v1", regex(r"0[xX][0-9A-Fa-f]+", |lex| parse_int(lex, 16)))]
-    #[lang_util(as = "int_constant", kind = "literal")]
+    #[lang_util(parser = "int_constant", kind = "literal")]
     IntConstant(i32),
     #[cfg_attr(feature = "v1", regex(r"0[0-7]*[uU]", |lex| parse_uint(lex, 8)))]
     #[cfg_attr(feature = "v1", regex(r"[1-9][0-9]*[uU]", |lex| parse_uint(lex, 10)))]
     #[cfg_attr(feature = "v1", regex(r"0[xX][0-9A-Fa-f]+[uU]", |lex| parse_uint(lex, 16)))]
-    #[lang_util(as = "uint_constant", kind = "literal")]
+    #[lang_util(parser = "uint_constant", kind = "literal")]
     UIntConstant(u32),
     #[cfg_attr(feature = "v1", token("true", |_| true))]
     #[cfg_attr(feature = "v1", token("false", |_| false))]
-    #[lang_util(as = "bool_constant", kind = "literal")]
+    #[lang_util(parser = "bool_constant", kind = "literal")]
     BoolConstant(bool),
     #[cfg_attr(
         feature = "v1",
@@ -802,7 +802,7 @@ pub enum Token {
         )
     )]
     #[cfg_attr(feature = "v1", regex(r"[0-9]+[eE][+-]?[0-9]+(lf|LF)", parse_f64))]
-    #[lang_util(as = "double_constant", kind = "literal")]
+    #[lang_util(parser = "double_constant", kind = "literal")]
     DoubleConstant(f64),
     #[cfg_attr(feature = "v1", token("<<"))]
     #[lang_util(token = "<<", kind = "binary operator", kind = "operator")]
@@ -974,89 +974,93 @@ pub enum Token {
 
     // TODO: Line continuation can happen inside tokens
     #[cfg_attr(feature = "v1", regex("([ \t\r\n]|\\\\\r?\n)+", logos::skip))]
-    #[lang_util(display = "<whitespace>", as(display), kind = "trivia")]
+    #[lang_util(display = "<whitespace>", parser(display), kind = "trivia")]
     Whitespace,
     #[cfg_attr(feature = "v1", regex("//(.|\\\\\r?\n)*", |lex| { parse_cmt(lex, true); logos::Skip }))]
-    #[lang_util(display = "<single line comment>", as(display), kind = "trivia")]
+    #[lang_util(display = "<single line comment>", parser(display), kind = "trivia")]
     SingleLineComment,
     #[cfg_attr(feature = "v1", regex("/\\*([^*]|\\*[^/])+\\*/", |lex| { parse_cmt(lex, false); logos::Skip }))]
-    #[lang_util(display = "<multi line comment>", as(display), kind = "trivia")]
+    #[lang_util(display = "<multi line comment>", parser(display), kind = "trivia")]
     MultiLineComment,
 
     // TODO: Line continuations in preprocessor pragmas?
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*define"))]
-    #[lang_util(display = "#define", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#define", parser(display), kind = "preprocessor directive")]
     PpDefine,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*else"))]
-    #[lang_util(display = "#else", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#else", parser(display), kind = "preprocessor directive")]
     PpElse,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*elif"))]
-    #[lang_util(display = "#elif", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#elif", parser(display), kind = "preprocessor directive")]
     PpElif,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*endif"))]
-    #[lang_util(display = "#endif", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#endif", parser(display), kind = "preprocessor directive")]
     PpEndIf,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*error"))]
-    #[lang_util(display = "#error", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#error", parser(display), kind = "preprocessor directive")]
     PpError,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*if"))]
-    #[lang_util(display = "#if", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#if", parser(display), kind = "preprocessor directive")]
     PpIf,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*ifdef"))]
-    #[lang_util(display = "#ifdef", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#ifdef", parser(display), kind = "preprocessor directive")]
     PpIfDef,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*ifndef"))]
-    #[lang_util(display = "#ifndef", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#ifndef", parser(display), kind = "preprocessor directive")]
     PpIfNDef,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*include"))]
-    #[lang_util(display = "#include", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#include", parser(display), kind = "preprocessor directive")]
     PpInclude,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*line"))]
-    #[lang_util(display = "#line", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#line", parser(display), kind = "preprocessor directive")]
     PpLine,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*pragma"))]
-    #[lang_util(display = "#pragma", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#pragma", parser(display), kind = "preprocessor directive")]
     PpPragma,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*undef"))]
-    #[lang_util(display = "#undef", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#undef", parser(display), kind = "preprocessor directive")]
     PpUndef,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*version"))]
-    #[lang_util(display = "#version", as(display), kind = "preprocessor directive")]
+    #[lang_util(display = "#version", parser(display), kind = "preprocessor directive")]
     PpVersion,
     #[cfg_attr(feature = "v1", regex("#([ \t]|\\\\\r?\n)*extension"))]
-    #[lang_util(display = "#extension", as(display), kind = "preprocessor directive")]
+    #[lang_util(
+        display = "#extension",
+        parser(display),
+        kind = "preprocessor directive"
+    )]
     PpExtension,
 
     #[lang_util(
         display = "<preprocessor string>",
-        as(display),
+        parser(display),
         kind = "preprocessor string"
     )]
     PpRest(String),
 
-    #[lang_util(display = "core", as(display), kind = "version profile")]
+    #[lang_util(display = "core", parser(display), kind = "version profile")]
     PpCore,
-    #[lang_util(display = "compatibility", as(display), kind = "version profile")]
+    #[lang_util(display = "compatibility", parser(display), kind = "version profile")]
     PpCompatibility,
-    #[lang_util(display = "es", as(display), kind = "version profile")]
+    #[lang_util(display = "es", parser(display), kind = "version profile")]
     PpEs,
 
-    #[lang_util(display = "require", as(display), kind = "extension behavior")]
+    #[lang_util(display = "require", parser(display), kind = "extension behavior")]
     PpExtRequire,
-    #[lang_util(display = "enable", as(display), kind = "extension behavior")]
+    #[lang_util(display = "enable", parser(display), kind = "extension behavior")]
     PpExtEnable,
-    #[lang_util(display = "warn", as(display), kind = "extension behavior")]
+    #[lang_util(display = "warn", parser(display), kind = "extension behavior")]
     PpExtWarn,
-    #[lang_util(display = "disable", as(display), kind = "extension behavior")]
+    #[lang_util(display = "disable", parser(display), kind = "extension behavior")]
     PpExtDisable,
 
-    #[lang_util(display = "<{}>", as(display), kind = "include path")]
+    #[lang_util(display = "<{}>", parser(display), kind = "include path")]
     PpPathAbsolute(String),
-    #[lang_util(display = "\"{}\"", as(display), kind = "include path")]
+    #[lang_util(display = "\"{}\"", parser(display), kind = "include path")]
     PpPathRelative(String),
 
     #[cfg_attr(feature = "v1", error)]
-    #[lang_util(display = "<invalid token>", as(display), kind = "error")]
+    #[lang_util(display = "<invalid token>", parser(display), kind = "error")]
     Error,
 }
 

lang-pp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-pp"
-version = "0.5.3"
+version = "0.6.0-beta.1"
 authors = ["Alixinne <alixinne@pm.me>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -14,25 +14,25 @@ categories = ["parser-implementations", "rendering"]
 build = "build.rs"
 
 [dependencies]
-lang-util = "=0.5.3"
+lang-util = "=0.6.0-beta.1"
 
 string_cache = "0.8"
 thiserror = "1.0"
 arrayvec = "0.7"
-derive_more = "0.99"
+derive_more = { version = "1.0", features = ["display"] }
 
 # Preprocessor
 rowan = { version = "0.15", optional = true }
 cbitset = { version = "0.2", optional = true }
 static_assertions = { version = "1.1", optional = true }
 bimap = { version = "0.6", optional = true }
-itertools = { version = "0.10", optional = true }
+itertools = { version = "0.13", optional = true }
 
 # Extension registry
 once_cell = { version = "1.17.1", optional = true }
 
 [dev-dependencies]
-lang-util-dev = "=0.5.3"
+lang-util-dev = "=0.6.0-beta.1"
 
 expect-test = "1.3"
 encoding_rs = "0.8"

lang-pp/src/lexer/glue/token.rs

@@ -132,6 +132,6 @@ impl Token {
 impl From<crate::lexer::PreToken> for Token {
     fn from(pre: crate::lexer::PreToken) -> Self {
         // SAFETY: Token is a superset of PreToken
-        unsafe { std::mem::transmute(std::mem::transmute::<_, u16>(pre)) }
+        unsafe { std::mem::transmute(std::mem::transmute::<crate::lexer::PreToken, u16>(pre)) }
     }
 }

lang-pp/src/parser/syntax_kind.rs

@@ -287,7 +287,7 @@ impl From<lexer::Token> for SyntaxKind {
         }
 
         // SAFETY: Aside from LINECONT, SyntaxKind is a superset of lexer::Token
-        unsafe { std::mem::transmute(std::mem::transmute::<_, u16>(s)) }
+        unsafe { std::mem::transmute(std::mem::transmute::<lexer::Token, u16>(s)) }
     }
 }