mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 23:34:47 -05:00
Upgrade to rust 1.37.0 (#2786)
This commit is contained in:
parent
1978358328
commit
de713e42c8
6 changed files with 8 additions and 8 deletions
|
@ -12,7 +12,7 @@ environment:
|
||||||
DENO_BUILD_PATH: $(APPVEYOR_BUILD_FOLDER)\target\release
|
DENO_BUILD_PATH: $(APPVEYOR_BUILD_FOLDER)\target\release
|
||||||
DENO_THIRD_PARTY_PATH: $(APPVEYOR_BUILD_FOLDER)\third_party
|
DENO_THIRD_PARTY_PATH: $(APPVEYOR_BUILD_FOLDER)\third_party
|
||||||
RELEASE_ARTIFACT: deno_win_x64.zip
|
RELEASE_ARTIFACT: deno_win_x64.zip
|
||||||
RUST_VERSION: 1.36.0
|
RUST_VERSION: 1.37.0
|
||||||
RUST_DIR: $(USERPROFILE)\rust-$(RUST_VERSION)
|
RUST_DIR: $(USERPROFILE)\rust-$(RUST_VERSION)
|
||||||
CARGO_HOME: $(RUST_DIR)\cargo
|
CARGO_HOME: $(RUST_DIR)\cargo
|
||||||
RUSTUP_HOME: $(RUST_DIR)\rustup
|
RUSTUP_HOME: $(RUST_DIR)\rustup
|
||||||
|
|
|
@ -5,7 +5,7 @@ git:
|
||||||
depth: 1
|
depth: 1
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- RUST_VERSION=1.36.0
|
- RUST_VERSION=1.37.0
|
||||||
- CARGO_HOME=$TRAVIS_BUILD_DIR/third_party/rust_crates/
|
- CARGO_HOME=$TRAVIS_BUILD_DIR/third_party/rust_crates/
|
||||||
- RUSTUP_HOME=$HOME/.rustup/
|
- RUSTUP_HOME=$HOME/.rustup/
|
||||||
- RUST_BACKTRACE=full
|
- RUST_BACKTRACE=full
|
||||||
|
|
|
@ -112,8 +112,8 @@ pub struct CompiledFileMetadata {
|
||||||
pub version_hash: String,
|
pub version_hash: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
static SOURCE_PATH: &'static str = "source_path";
|
static SOURCE_PATH: &str = "source_path";
|
||||||
static VERSION_HASH: &'static str = "version_hash";
|
static VERSION_HASH: &str = "version_hash";
|
||||||
|
|
||||||
impl CompiledFileMetadata {
|
impl CompiledFileMetadata {
|
||||||
pub fn from_json_string(metadata_string: String) -> Option<Self> {
|
pub fn from_json_string(metadata_string: String) -> Option<Self> {
|
||||||
|
|
|
@ -556,8 +556,8 @@ pub struct SourceCodeHeaders {
|
||||||
pub redirect_to: Option<String>,
|
pub redirect_to: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
static MIME_TYPE: &'static str = "mime_type";
|
static MIME_TYPE: &str = "mime_type";
|
||||||
static REDIRECT_TO: &'static str = "redirect_to";
|
static REDIRECT_TO: &str = "redirect_to";
|
||||||
|
|
||||||
impl SourceCodeHeaders {
|
impl SourceCodeHeaders {
|
||||||
pub fn from_json_string(headers_string: String) -> Self {
|
pub fn from_json_string(headers_string: String) -> Self {
|
||||||
|
|
|
@ -91,7 +91,7 @@ pub trait ImportStream: Stream {
|
||||||
type DynImportStream =
|
type DynImportStream =
|
||||||
Box<dyn ImportStream<Item = RecursiveLoadEvent, Error = ErrBox> + Send>;
|
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
|
/// Wraps DynImportStream to include the deno_dyn_import_id, so that it doesn't
|
||||||
/// need to be exposed.
|
/// need to be exposed.
|
||||||
|
|
|
@ -9,7 +9,7 @@ use hyper::service::service_fn_ok;
|
||||||
use hyper::{Body, Response, Server};
|
use hyper::{Body, Response, Server};
|
||||||
use std::env;
|
use std::env;
|
||||||
|
|
||||||
static PHRASE: &'static [u8] = b"Hello World!";
|
static PHRASE: &[u8] = b"Hello World!";
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let mut port: u16 = 4544;
|
let mut port: u16 = 4544;
|
||||||
|
|
Loading…
Reference in a new issue