michael/sailfish
michael
/
sailfish
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into pr/125

This commit is contained in:
Vince Pike 2023-07-25 11:51:32 -04:00
parent 935bc8ebf4 646ab62fe8
commit 6e6dc93bb4
11 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CHANGELOG.md
View File

@ -1,4 +1,5 @@
## [Unreleased]
<a name="v0.7.0"></a>
## [v0.7.0](https://github.com/rust-sailfish/sailfish/compare/v0.6.1...v0.7.0) (2023-06-22)
### Breaking Change
@ -12,50 +13,50 @@
<a name="v0.4.0"></a>
## [v0.4.0](https://github.com/rust-sailfish/sailfish/compare/v0.3.4...v0.4.0) (2022-03-10)
## Fix
### Fix
* Fix some issues pointing to the wrong documentation links
##Breaking Change
### Breaking Change
* Changed format to .TOML instead of .yaml to better match what Rust uses.
<a name="v0.3.4"></a>
## [v0.3.4](https://github.com/rust-sailfish/sailfish/compare/v0.3.3...v0.3.4) (2021-02-13)
## Fix
### Fix
* Update some dependencies
<a name="v0.3.3"></a>
## [v0.3.3](https://github.com/rust-sailfish/sailfish/compare/v0.3.2...v0.3.3) (2021-04-06)
## Fix
### Fix
* Improve error message for missing semicolon in code blocks
<a name="v0.3.2"></a>
## [v0.3.2](https://github.com/rust-sailfish/sailfish/compare/v0.3.1...v0.3.2) (2021-03-29)
## Fix
### Fix
* Avoid sable/nightly mismatch error caused by proc-macro2 crate
<a name="v0.3.1"></a>
## [v0.3.1](https://github.com/rust-sailfish/sailfish/compare/v0.3.0...v0.3.1) (2021-01-23)
## New Features
### New Features
* Allow unsized types for filters
## Fix
### Fix
* Workaround for incorrect cargo fingerprints
<a name="v0.3.0"></a>
## [v0.3.0](https://github.com/rust-sailfish/sailfish/compare/v0.2.2...v0.3.0) (2020-12-20)
## Breaking changes
### Breaking changes
* No longer requires `extern crate sailfish_macros` (which raise compilation warnings with v0.3.0)
* Remove `TemplaceOnce::render_to_string` method (already deprecated in v0.2.1)
@ -63,12 +64,12 @@
* Change `RenderError` into enum
* Update error format in `sailfish-compiler`
## New features
### New features
* New filters: `json`, `truncate`
* Impl `Send`/`Sync` for `Buffer`
## Fix
### Fix
* Fix rendering issue on continue/break statements
* Do not panic when buffer size decreased
@ -78,14 +79,14 @@
<a name="v0.2.3"></a>
## [v0.2.3](https://github.com/rust-sailfish/sailfish/compare/v0.2.2...v0.2.3) (2020-11-29)
## Fix
### Fix
* Use `std::result::Result` in derive macro to allow custom Result types (#34)
<a name="v0.2.2"></a>
## [v0.2.2](https://github.com/rust-sailfish/sailfish/compare/v0.2.1...v0.2.2) (2020-11-11)
## Fix
### Fix
* Update proc-macro2 version (#32)

8
Cargo.lock generated
View File

@ -90,7 +90,7 @@ dependencies = [
[[package]]
name = "integration-tests"
version = "0.6.1"
version = "0.7.0"
dependencies = [
"pretty_assertions",
"sailfish",
@ -186,7 +186,7 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "sailfish"
version = "0.6.1"
version = "0.7.0"
dependencies = [
"itoap",
"ryu",
@ -198,7 +198,7 @@ dependencies = [
[[package]]
name = "sailfish-compiler"
version = "0.6.1"
version = "0.7.0"
dependencies = [
"filetime",
"home",
@ -213,7 +213,7 @@ dependencies = [
[[package]]
name = "sailfish-macros"
version = "0.6.1"
version = "0.7.0"
dependencies = [
"proc-macro2",
"sailfish-compiler",

2
README.md
View File

@ -31,7 +31,7 @@ Dependencies:
```toml
[dependencies]
sailfish = "0.6.1"
sailfish = "0.7.0"
```
Template file (templates/hello.stpl):

2
docs/en/docs/installation.md
View File

@ -4,7 +4,7 @@ In order to use sailfish templates, you have add two dependencies in your `Cargo
``` toml
[dependencies]
sailfish = "0.6.1"
sailfish = "0.7.0"
```
## Feature Flags

2
examples/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish-examples"
version = "0.6.1"
version = "0.7.0"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
edition = "2018"
publish = false

2
sailfish-compiler/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish-compiler"
version = "0.6.1"
version = "0.7.0"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
description = "Simple, small, and extremely fast template engine for Rust"
homepage = "https://github.com/rust-sailfish/sailfish"

4
sailfish-macros/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish-macros"
version = "0.6.1"
version = "0.7.0"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
description = "Simple, small, and extremely fast template engine for Rust"
homepage = "https://github.com/rust-sailfish/sailfish"
@ -30,6 +30,6 @@ proc-macro2 = "1.0.56"
[dependencies.sailfish-compiler]
path = "../sailfish-compiler"
version = "0.6.1"
version = "0.7.0"
default-features = false
features = ["procmacro"]

2
sailfish-tests/fuzzing-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "fuzzing-tests"
version = "0.6.1"
version = "0.7.0"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
edition = "2018"
publish = false

2
sailfish-tests/integration-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "integration-tests"
version = "0.6.1"
version = "0.7.0"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
edition = "2018"
publish = false

4
sailfish/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish"
version = "0.6.1"
version = "0.7.0"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
description = "Simple, small, and extremely fast template engine for Rust"
homepage = "https://github.com/rust-sailfish/sailfish"
@ -31,7 +31,7 @@ serde_json = { version = "1.0.95", optional = true }
[dependencies.sailfish-macros]
path = "../sailfish-macros"
version = "0.6.1"
version = "0.7.0"
default-features = false
optional = true

12
scripts/bump-version.sh
View File

@ -6,8 +6,16 @@ if [ $# != 1 ]; then
exit 1
fi
SCRIPT_DIR="$( pwd )"
cd $SCRIPT_DIR/..
CURRENT_DIR="$( pwd )"
if [ -z "${CURRENT_DIR##*scripts}" ] ; then
# Go up now, because we are in the scripts directory
cd ..
else
echo "Please enter the scripts directory, and then execute this script.";
exit 1
fi;
OLD_VERSION="$(cat README.md |grep '^sailfish\s*=' |cut -d '"' -f2)"
NEW_VERSION="${1}"