Skip to content

Commit

Permalink
Version 0.4.0
Browse files Browse the repository at this point in the history
See CHANGELOG.md
  • Loading branch information
Marwes committed May 16, 2017
1 parent 1fb56a7 commit c05ef5f
Show file tree
Hide file tree
Showing 13 changed files with 92 additions and 23 deletions.
6 changes: 6 additions & 0 deletions .clog.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[clog]
repository = "https://github.com/gluon-lang/gluon"

changelog = "CHANGELOG.md"

from-latest-tag = true
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# rustfmt backup files
*.bk

*.bak

target
Cargo.lock

Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
<a name="v0.4.0"></a>
## v0.4.0 (2017-05-16)

Version 0.4.0 is a primarily a bug fix release with only a single significant feature as the upcoming features are all still WIP.

#### Features

* Name the the parser's tokens fit better in error messages ([33f733c8](https://github.com/gluon-lang/gluon/commit/33f733c88618092a545183114a56f1dcd5d9ec5e))
* Use the async branch of hyper in the http example ([46f1dc39](https://github.com/gluon-lang/gluon/commit/46f1dc39313bec63a0027a2dceb8c434305568d1))
* **http:** Add multiple routes for the http server example ([e93109d0](https://github.com/gluon-lang/gluon/commit/e93109d01c3f4b9e1c9c7147bdf7e87715f6c6b1))
* **repl:** Allow binding variables in the repl for later use ([4f0dcf99](https://github.com/gluon-lang/gluon/commit/4f0dcf99b87910a869cd3f2a4aa5e61267a5cea2))

#### Bug Fixes

* Display what tokens are expected when the parser fails ([6925c7b5](https://github.com/gluon-lang/gluon/commit/6925c7b53b6f896e747a8bbb4fc46a45e5c0c131), closes [#270](https://github.com/gluon-lang/gluon/issues/270))
* Update the http server example to conform to a newer hyper version ([c841e4f3](https://github.com/gluon-lang/gluon/commit/c841e4f33f543ad2cfa23107da434236fae7f61e))
* **check:**
* When checking record constructors, include the type fields in the guess ([60d8cb0b](https://github.com/gluon-lang/gluon/commit/60d8cb0b3edd1546521c3ce56fc44d411477e629))
* Don't guess a record type when the field list is empty ([9db233a0](https://github.com/gluon-lang/gluon/commit/9db233a06dd712eabefdcbb67e07550718bdd998))
* **http:** Move the handler creation of the http server to a file ([248474e6](https://github.com/gluon-lang/gluon/commit/248474e6a5c75e5f7697de71515823623b624a68))

#### Performance

* Reuse an existing Kind::Type instance when creating a type variable ([81befe0c](https://github.com/gluon-lang/gluon/commit/81befe0cf07e8e1961132f18c01052a00b6306d1))
* Add a kind cache as well to mirror the type cache ([f3c9efd2](https://github.com/gluon-lang/gluon/commit/f3c9efd287c8a43c985cbd0d2fac4731d6807faf))
* Reuse the Arc pointers for builtin types ([ff3ab278](https://github.com/gluon-lang/gluon/commit/ff3ab2788b8cb8340d8d62f5825df1d2a2bd7890))



<a name="v0.3.0"></a>
## v0.3.0 (2017-02-01)

Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "gluon"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus <[email protected]>"]
build = "build.rs"

Expand All @@ -22,10 +22,10 @@ name = "gluon"
path = "src/lib.rs"

[dependencies]
gluon_base = { path = "base", version = "0.3.0" }
gluon_check = { path = "check", version = "0.3.0" }
gluon_parser = { path = "parser", version = "0.3.0" }
gluon_vm = { path = "vm", version = "0.3.0" }
gluon_base = { path = "base", version = "0.4.0" } # GLUON
gluon_check = { path = "check", version = "0.4.0" } # GLUON
gluon_parser = { path = "parser", version = "0.4.0" } # GLUON
gluon_vm = { path = "vm", version = "0.4.0" } # GLUON

log = "0.3.6"
quick-error = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Gluon requires a recent Rust compiler to build (1.9.0 or later) and is available

```toml
[dependencies]
gluon = "0.3.0"
gluon = "0.4.0"
```

#### Other languages
Expand Down
2 changes: 1 addition & 1 deletion base/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gluon_base"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus <[email protected]>"]

license = "MIT"
Expand Down
4 changes: 2 additions & 2 deletions c-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gluon_c-api"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus Westerlind <[email protected]>"]

license = "MIT"
Expand All @@ -15,7 +15,7 @@ crate-type = ["staticlib"]

[dependencies]
libc = "0.2.14"
gluon = { version = "0.3.0", path = ".." }
gluon = { version = "0.4.0", path = ".." } # GLUON

[features]
test = ["gluon/test"]
Expand Down
6 changes: 3 additions & 3 deletions check/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gluon_check"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus <[email protected]>"]

license = "MIT"
Expand All @@ -15,8 +15,8 @@ env_logger = { version = "0.3.4", optional = true }
log = "0.3.6"
union-find = "0.3.1"
smallvec = "0.2.1"
gluon_base = { path = "../base", version = "0.3.0" }
gluon_parser = { path = "../parser", version = "0.3.0", optional = true }
gluon_base = { path = "../base", version = "0.4.0" } # GLUON
gluon_parser = { path = "../parser", version = "0.4.0", optional = true } # GLUON

[dev-dependencies]
collect-mac = "0.1.0"
Expand Down
4 changes: 2 additions & 2 deletions parser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gluon_parser"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus <[email protected]>"]

license = "MIT"
Expand All @@ -17,7 +17,7 @@ env_logger = { version = "0.3.4", optional = true }
quick-error = "1.0.0"
lalrpop-util = "0.12.5"
log = "0.3.6"
gluon_base = { path = "../base", version = "0.3.0" }
gluon_base = { path = "../base", version = "0.4.0" } # GLUON

[dev-dependencies]
collect-mac = "0.1.0"
Expand Down
5 changes: 3 additions & 2 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
(cd parser && cargo publish $@) &&
(cd check && cargo publish $@) &&
(cd vm && cargo publish $@) &&
cargo publish
(cd c-api && cargo publish $@)
cargo publish &&
(cd c-api && cargo publish $@) &&
(cd repl && cargo publish $@)
6 changes: 3 additions & 3 deletions repl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "gluon_repl"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus Westerlind <[email protected]>"]

[[bin]]
name = "gluon"

[dependencies]

gluon_vm = { version = "0.3.0", path = "../vm" }
gluon = { version = "0.3.0", path = ".." }
gluon_vm = { version = "0.4.0", path = "../vm" } # GLUON
gluon = { version = "0.4.0", path = ".." } # GLUON

futures = "0.1.11"
clap = "2.22.0"
Expand Down
31 changes: 31 additions & 0 deletions version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/sh
# Modified from https://github.com/nikomatsakis/lalrpop/blob/master/version.sh
#
# A script to bump the version number on all Cargo.toml files etc in
# an atomic fashion.

if [ "$1" == "" ]; then
echo "Usage: version.sh <new-version-number>"
exit 1
fi

VERSION=$(
ls **/Cargo.toml | \
xargs grep "# GLUON$" | \
perl -p -e 's/.*version = "([0-9.]+)"[^#]+# GLUON$/$1/' |
sort |
uniq)

if [ $(echo $VERSION | wc -w) != 1 ]; then
echo "Error: inconsistent versions detected across Cargo.toml files!"
echo "$VERSION"
exit 1
fi

echo "Found consistent version $VERSION"

perl -p -i -e 's/version *= *"[0-9.]+"([^#]+)# GLUON/version = "'$1'"$1# GLUON/' \
$(ls **/Cargo.toml Cargo.toml)

perl -p -i -e 's/^gluon *= *"[0-9.]+"/gluon = "'$1'"/' \
README.md
8 changes: 4 additions & 4 deletions vm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gluon_vm"
version = "0.3.0"
version = "0.4.0" # GLUON
authors = ["Markus <[email protected]>"]

license = "MIT"
Expand All @@ -25,9 +25,9 @@ futures = "0.1.0"
typed-arena = "1.2.0"
smallvec = "0.2.1"

gluon_base = { path = "../base", version = "0.3.0" }
gluon_check = { path = "../check", version = "0.3.0" }
gluon_parser = { path = "../parser", version = "0.3.0", optional = true }
gluon_base = { path = "../base", version = "0.4.0" } # GLUON
gluon_check = { path = "../check", version = "0.4.0" } # GLUON
gluon_parser = { path = "../parser", version = "0.4.0", optional = true } # GLUON

[build-dependencies]
lalrpop = { version = "0.12.5", optional = true }
Expand Down

0 comments on commit c05ef5f

Please sign in to comment.