Upgrade to rust 1.37.0 (#2786)

This commit is contained in:
Ryan Dahl 2019-08-16 20:49:00 -04:00 committed by GitHub
parent 1978358328
commit de713e42c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions

View file

@ -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.36.0
RUST_VERSION: 1.37.0
RUST_DIR: $(USERPROFILE)\rust-$(RUST_VERSION)
CARGO_HOME: $(RUST_DIR)\cargo
RUSTUP_HOME: $(RUST_DIR)\rustup

View file

@ -5,7 +5,7 @@ git:
depth: 1
env:
global:
- RUST_VERSION=1.36.0
- RUST_VERSION=1.37.0
- CARGO_HOME=$TRAVIS_BUILD_DIR/third_party/rust_crates/
- RUSTUP_HOME=$HOME/.rustup/
- RUST_BACKTRACE=full

View file

@ -112,8 +112,8 @@ pub struct CompiledFileMetadata {
pub version_hash: String,
}
static SOURCE_PATH: &'static str = "source_path";
static VERSION_HASH: &'static str = "version_hash";
static SOURCE_PATH: &str = "source_path";
static VERSION_HASH: &str = "version_hash";
impl CompiledFileMetadata {
pub fn from_json_string(metadata_string: String) -> Option<Self> {

View file

@ -556,8 +556,8 @@ pub struct SourceCodeHeaders {
pub redirect_to: Option<String>,
}
static MIME_TYPE: &'static str = "mime_type";
static REDIRECT_TO: &'static str = "redirect_to";
static MIME_TYPE: &str = "mime_type";
static REDIRECT_TO: &str = "redirect_to";
impl SourceCodeHeaders {
pub fn from_json_string(headers_string: String) -> Self {

View file

@ -91,7 +91,7 @@ pub trait ImportStream: Stream {
type DynImportStream =
Box<dyn ImportStream<Item = RecursiveLoadEvent, Error = ErrBox> + Send>;
type DynImportFn = Fn(deno_dyn_import_id, &str, &str) -> DynImportStream;
type DynImportFn = dyn Fn(deno_dyn_import_id, &str, &str) -> DynImportStream;
/// Wraps DynImportStream to include the deno_dyn_import_id, so that it doesn't
/// need to be exposed.

View file

@ -9,7 +9,7 @@ use hyper::service::service_fn_ok;
use hyper::{Body, Response, Server};
use std::env;
static PHRASE: &'static [u8] = b"Hello World!";
static PHRASE: &[u8] = b"Hello World!";
fn main() {
let mut port: u16 = 4544;