Skip to content

Commit

Permalink
v3.2.0 (#170)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeWaka authored Apr 21, 2024
1 parent 9a104a6 commit bd5c3af
Show file tree
Hide file tree
Showing 5 changed files with 103 additions and 53 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ insert_final_newline = true

[*.dm]
indent_style = tab

[*.yml]
indent_size = 2
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Build (release) (default features)
run: cargo build --target i686-pc-windows-msvc --locked --release

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Windows Build
path: |
Expand All @@ -39,8 +39,8 @@ jobs:
build-linux:
runs-on: ubuntu-latest
env:
BYOND_MAJOR: 514
BYOND_MINOR: 1585
BYOND_MAJOR: 515
BYOND_MINOR: 1636
PKG_CONFIG_ALLOW_CROSS: 1

steps:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Build (release) (default features)
run: cargo build --target i686-unknown-linux-gnu --locked --release

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Linux Build
path: |
Expand Down
140 changes: 93 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "rust-g"
edition = "2021"
version = "3.1.0"
version = "3.2.0"
authors = [
"Bjorn Neergaard <bjorn@neersighted.com>",
"Tad Hardesty <tad@platymuus.com>",
Expand Down Expand Up @@ -54,7 +54,7 @@ lazy_static = { version = "1.4", optional = true }
once_cell = { version = "1.19", optional = true }
mysql = { git = "https://github.com/ZeWaka/rust-mysql-simple.git", tag = "v25.0.0", default_features = false, optional = true }
dashmap = { version = "5.5", optional = true, features = ["rayon", "serde"] }
zip = { version = "0.6", optional = true }
zip = { version = "1.1", optional = true }
rand = { version = "0.8", optional = true }
toml-dep = { version = "0.8.12", package = "toml", optional = true }
aho-corasick = { version = "1.1", optional = true }
Expand Down
1 change: 1 addition & 0 deletions src/byond.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ pub fn set_panic_hook() {
});
}

#[allow(dead_code)] // Used depending on feature set
/// Utility for BYOND functions to catch panic unwinds safely and return a Result<String, Error>, as expected.
/// Usage: catch_panic(|| internal_safe_function(arguments))
pub fn catch_panic<F>(f: F) -> Result<String, Error>
Expand Down

0 comments on commit bd5c3af

Please sign in to comment.