Skip to content

Commit

Permalink
Merge pull request #79 from u2/chore_update_rust
Browse files Browse the repository at this point in the history
chore: update rust to 1.36.0
  • Loading branch information
doitian authored Jul 23, 2019
2 parents b40b0c8 + 2182696 commit 38affaa
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ env:
matrix:
include:
- os: osx
rust: 1.35.0
rust: 1.36.0
install:
- cargo fmt --version || rustup component add rustfmt-preview
- cargo clippy --version || rustup component add clippy-preview
env: SUITE=ci
- rust: 1.35.0
- rust: 1.36.0
addons:
apt:
packages:
Expand All @@ -28,37 +28,37 @@ matrix:
- texinfo
- libtool
env: SUITE=ci-quick
- rust: 1.35.0
- rust: 1.36.0
addons:
apt:
packages:
- git
- build-essential
env: SUITE=ci-generated
- rust: 1.35.0
- rust: 1.36.0
addons:
apt:
packages:
- git
- build-essential
env: SUITE=check
- rust: 1.35.0
- rust: 1.36.0
addons:
apt:
packages:
- git
- build-essential
env: SUITE=ci-all-features
- os: osx
rust: 1.35.0
rust: 1.36.0
addons:
apt:
packages:
- git
- build-essential
env: SUITE=ci-all-features
- name: Test Suite
rust: 1.35.0
rust: 1.36.0
dist: xenial
addons:
apt:
Expand All @@ -83,7 +83,7 @@ matrix:
RISCV=`pwd`/riscv ./ckb-vm-test-suite/test.sh
- name: Code Coverage
if: 'tag IS NOT present AND type != pull_request AND (branch = develop OR branch = master)'
rust: 1.35.0
rust: 1.36.0
dist: xenial
addons:
apt:
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ asm = ["libc", "memmap"]
byteorder = "1"
bytes = "0.4.12"
goblin = "0.0.22"
hashbrown = "0.5.0"
memmap = { version = "0.7.0", optional = true }
libc = { version = "0.2.47", optional = true }
ckb-vm-definitions = { path = "definitions", version = "0.13.0" }
Expand Down
2 changes: 1 addition & 1 deletion src/machine/aot/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ use super::super::{
use bytes::Bytes;
use emitter::Emitter;
use goblin::elf::{section_header::SHF_EXECINSTR, Elf};
use hashbrown::{HashMap, HashSet};
use memmap::{Mmap, MmapMut};
use std::collections::{HashMap, HashSet};
use std::rc::Rc;

const MAXIMUM_INSTRUCTIONS_PER_BLOCK: usize = 1024;
Expand Down

0 comments on commit 38affaa

Please sign in to comment.