Skip to content

Commit

Permalink
Bump version numbers everywhere to nightly-2019-10-04
Browse files Browse the repository at this point in the history
  • Loading branch information
rinon committed Oct 8, 2019
1 parent 1c603a2 commit 7837be0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[azure]: https://dev.azure.com/immunant/c2rust/_build/latest?definitionId=1&branchName=master
[Latest Version]: https://img.shields.io/crates/v/c2rust.svg
[crates.io]: https://crates.io/crates/c2rust
[Rustc Version]: https://img.shields.io/badge/rustc-nightly--2019--09--30-lightgrey.svg "Rustc nightly-2019-09-30"
[Rustc Version]: https://img.shields.io/badge/rustc-nightly--2019--10--04-lightgrey.svg "Rustc nightly-2019-10-04"

C2Rust helps you migrate C99-compliant code to Rust. The [translator](c2rust-transpile) (or transpiler) produces unsafe Rust code that closely mirrors the input C code. The primary goal of the translator is to preserve functionality; test suites should continue to pass after translation. Generating safe and idiomatic Rust code from C ultimately requires manual effort. However, we are building a scriptable [refactoring tool](c2rust-refactor) that reduces the tedium of doing so. You can also [cross-check](cross-checks) the translated code against the original ([tutorial](docs/cross-check-tutorial.md)).

Expand Down Expand Up @@ -51,22 +51,22 @@ Finally, a rust installation with [Rustup](https://rustup.rs/) is required on al

### Installing from crates.io

cargo +nightly-2019-09-30 install c2rust
cargo +nightly-2019-10-04 install c2rust

On OS X with Homebrew LLVM, you need to point the build system at the LLVM installation as follows:

LLVM_CONFIG_PATH=/usr/local/opt/llvm/bin/llvm-config cargo +nightly-2019-09-30 install c2rust
LLVM_CONFIG_PATH=/usr/local/opt/llvm/bin/llvm-config cargo +nightly-2019-10-04 install c2rust

On Linux with Linuxbrew LLVM, you need to point the build system at the LLVM installation as follows:

LLVM_CONFIG_PATH=/home/linuxbrew/.linuxbrew/opt/llvm/bin/llvm-config cargo +nightly-2019-09-30 install c2rust
LLVM_CONFIG_PATH=/home/linuxbrew/.linuxbrew/opt/llvm/bin/llvm-config cargo +nightly-2019-10-04 install c2rust

Note: adjust `LLVM_CONFIG_PATH` accordingly if Linuxbrew was installed to your home directory.

On Gentoo, you need to point the build system to the location of `libclang.so`
and `llvm-config` as follows:

LLVM_CONFIG_PATH=/path/to/llvm-config LIBCLANG_PATH=/path/to/libclang.so cargo +nightly-2019-09-30 install c2rust
LLVM_CONFIG_PATH=/path/to/llvm-config LIBCLANG_PATH=/path/to/libclang.so cargo +nightly-2019-10-04 install c2rust


If you have trouble with building and installing, or want to build from the latest master, the [developer docs](docs/README-developers.md#building-with-system-llvm-libraries) provide more details on the build system.
Expand All @@ -76,7 +76,7 @@ If you have trouble with building and installing, or want to build from the late
If you'd like to check our recently developed features or you urgently require a bugfixed version of c2rust
you can install it directly from Git:

cargo +nightly-2019-09-30 install --git https://github.com/immunant/c2rust.git c2rust
cargo +nightly-2019-10-04 install --git https://github.com/immunant/c2rust.git c2rust

Please note that the master branch is under constant development and you may expirience issues or crashes.

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN chmod +x /tmp/provision*.sh && /tmp/provision.sh

USER $USER
# Provision rust language and packages (should not run as root)
ARG RUST_VER=nightly-2019-09-30
ARG RUST_VER=nightly-2019-10-04
RUN RUST_VER=$RUST_VER /tmp/provision_rust.sh

ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
Expand Down
2 changes: 1 addition & 1 deletion examples/robotfindskitten/repo/rust/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2019-09-30
nightly-2019-10-04
2 changes: 1 addition & 1 deletion scripts/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class Config:
MIN_PLUMBUM_VERSION = (1, 6, 3)
CC_DB_JSON = "compile_commands.json"

CUSTOM_RUST_NAME = 'nightly-2019-09-30'
CUSTOM_RUST_NAME = 'nightly-2019-10-04'

"""
Reflect changes to all configuration variables that depend on LLVM_VER
Expand Down
2 changes: 1 addition & 1 deletion scripts/provision_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [[ "$EUID" -eq 0 ]]
exit
fi

RUST_VER=${RUST_VER:-nightly-2019-09-30}
RUST_VER=${RUST_VER:-nightly-2019-10-04}
if hash rustup 2>/dev/null; then # rustup is installed
rustup toolchain install $RUST_VER
rustup default $RUST_VER
Expand Down

0 comments on commit 7837be0

Please sign in to comment.