From db5c66a638d399d5ebb2832bb7b52e8f76ced49d Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 11 Jul 2019 04:29:03 +0200 Subject: [PATCH] Upgrade rust to v1.36.0 --- .appveyor.yml | 2 +- .travis.yml | 2 +- website/manual.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index fbc0efe95c..26984952aa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,7 +12,7 @@ environment: DENO_BUILD_PATH: $(APPVEYOR_BUILD_FOLDER)\target\release DENO_THIRD_PARTY_PATH: $(APPVEYOR_BUILD_FOLDER)\third_party RELEASE_ARTIFACT: deno_win_x64.zip - RUST_VERSION: 1.35.0 + RUST_VERSION: 1.36.0 RUST_DIR: $(USERPROFILE)\rust-$(RUST_VERSION) CARGO_HOME: $(RUST_DIR)\cargo RUSTUP_HOME: $(RUST_DIR)\rustup diff --git a/.travis.yml b/.travis.yml index b2fbc67376..8157e153e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ git: depth: 1 env: global: - - RUST_VERSION=1.35.0 + - RUST_VERSION=1.36.0 - CARGO_HOME=$TRAVIS_BUILD_DIR/third_party/rust_crates/ - RUSTUP_HOME=$HOME/.rustup/ - RUST_BACKTRACE=full diff --git a/website/manual.md b/website/manual.md index a23fa10158..4025e5acca 100644 --- a/website/manual.md +++ b/website/manual.md @@ -174,7 +174,7 @@ cd deno To ensure reproducible builds, deno has most of its dependencies in a git submodule. However, you need to install separately: -1. [Rust](https://www.rust-lang.org/en-US/install.html) >= 1.34.1 +1. [Rust](https://www.rust-lang.org/en-US/install.html) >= 1.36.0 2. [Node](https://nodejs.org/) 3. Python 2. [Not 3](https://github.com/denoland/deno/issues/464#issuecomment-411795578). @@ -961,7 +961,7 @@ $ rust-lldb -- ./target/debug/deno run --allow-net tests/http_bench.ts # `ImportError: cannot import name _remove_dead_weakref` # In that case, use system python by setting PATH, e.g. # PATH=/System/Library/Frameworks/Python.framework/Versions/2.7/bin:$PATH -(lldb) command script import "/Users/kevinqian/.rustup/toolchains/1.34.1-x86_64-apple-darwin/lib/rustlib/etc/lldb_rust_formatters.py" +(lldb) command script import "/Users/kevinqian/.rustup/toolchains/1.36.0-x86_64-apple-darwin/lib/rustlib/etc/lldb_rust_formatters.py" (lldb) type summary add --no-value --python-function lldb_rust_formatters.print_val -x ".*" --category Rust (lldb) type category enable Rust (lldb) target create "../deno/target/debug/deno"