Skip to content

Commit 39cd7c8

Browse files
author
Anton Kochkov
committed
Update dependencies, CI fixes
1 parent 50666e2 commit 39cd7c8

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

.appveyor.yml

+24
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ branches:
55
- master
66

77
environment:
8+
LLVM_VERSION: 9.0.1
9+
PLATFORM: x64
810
matrix:
911
# Allow failure for stable channel because
1012
# some used Rust features are not available yet
@@ -23,24 +25,46 @@ environment:
2325
# target: x86_64-pc-windows-msvc
2426
- channel: nightly
2527
target: i686-pc-windows-msvc
28+
type: msvc
2629
- channel: nightly
2730
target: x86_64-pc-windows-msvc
31+
type: msvc
2832

2933
#- channel: beta
3034
# target: i686-pc-windows-gnu
3135
#- channel: beta
3236
# target: x86_64-pc-windows-gnu
3337
- channel: nightly
3438
target: i686-pc-windows-gnu
39+
type: gnu
3540
- channel: nightly
3641
target: x86_64-pc-windows-gnu
42+
type: gnu
3743

3844
install:
45+
- if %PLATFORM% == x86 (set RUST_PLATFORM=i686&set MINGW_BITS=32) else (set RUST_PLATFORM=x86_64&set MINGW_BITS=64)
46+
- ps: >-
47+
If ($env:target -eq 'x86_64-pc-windows-gnu') {
48+
$env:PATH += ';C:\msys64\mingw64\bin'
49+
} ElseIf ($env:target -eq 'i686-pc-windows-gnu') {
50+
$env:PATH += ';C:\msys64\mingw32\bin'
51+
}
3952
- appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
4053
- rustup-init -yv --default-toolchain %channel% --default-host %target%
4154
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
4255
- rustc -vV
4356
- cargo -vV
57+
# Install LLVM for GNU
58+
- if %type%==gnu set PATH=C:\msys64\mingw%MINGW_BITS%\bin;C:\msys64\usr\bin;%PATH%
59+
- if %type%==gnu set "MINGW_URL=http://repo.msys2.org/mingw/%RUST_PLATFORM%/mingw-w64-%RUST_PLATFORM%"
60+
- if %type%==gnu set "URL_VER=%LLVM_VERSION%-1-any.pkg.tar.xz"
61+
- if %type%==gnu bash -lc "pacman -U --noconfirm $MINGW_URL-clang-$URL_VER $MINGW_URL-llvm-$URL_VER"
62+
- if %type%==gnu bash -lc "clang --version"
63+
# Use preinstalled LLVM for MSVC
64+
- if %type%==msvc set PATH=%PATH%;C:\Program Files\LLVM\bin
65+
- if %type%==msvc where clang
66+
- if %type%==msvc clang --version
67+
4468
build_script:
4569
- cargo build -vv
4670
test_script:

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ before_script:
7777
# the main build
7878
script:
7979
- |
80-
cargo build --verbose --no-default-features &&
81-
cargo test --verbose --no-default-features &&
80+
cargo build --verbose &&
81+
cargo test --verbose &&
8282
chmod 644 radeco-lib/src/middle/ir_reader/parser.rs &&
8383
if [ "${CHECKFMT}" == "1" ]; then
8484
rustfmt radeco-lib/src/middle/ir_reader/parser.rs

radeco-lib/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ quickcheck = "0.8.5"
2121
quickcheck_macros = "0.8.0"
2222

2323
[build-dependencies]
24-
lalrpop = "0.17"
24+
lalrpop = { version = "0.18", features = ["lexer"] }
2525
regex = "1.3"
2626

2727
[dependencies]
@@ -31,15 +31,15 @@ serde_json = "1.0"
3131
lazy_static = "1.4"
3232
docopt = "1.1"
3333
rayon = "1.2"
34-
lalrpop-util = "0.17"
34+
lalrpop-util = "0.18"
3535
fixedbitset = "0.2"
3636
either = "1.5"
3737
vec_map = "0.8"
38-
typed-arena = "1.7"
38+
typed-arena = "2.0"
3939
bit-set = "0.5"
4040
num = "0.2"
4141
linear-map = "1.2.0"
42-
base64 = "0.9.2"
42+
base64 = "0.12"
4343

4444
log = { version = "0.4", optional = true }
4545
env_logger = { version = "0.7", optional = true }

radeco/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ trace_log = ["radeco-lib/trace_log", "log", "env_logger"]
1717

1818
[dependencies]
1919
rustc-serialize = "*"
20-
base64 = "0.11"
21-
rustyline = "5.0"
20+
base64 = "0.12"
21+
rustyline = "6.0"
2222
lazy_static = "1.4"
2323
clap = "2.33"
24-
syntect = "3.3"
24+
syntect = "4.1"
2525

2626
log = { version = "0.4", optional = true }
2727
env_logger = { version = "0.7", optional = true }

radeco/src/main.rs

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use rustyline::completion::{Completer, FilenameCompleter};
2121
use rustyline::error::ReadlineError;
2222
use rustyline::highlight::Highlighter;
2323
use rustyline::hint::Hinter;
24+
use rustyline::validate::Validator;
2425
use rustyline::{CompletionType, Config, Context, EditMode, Editor, Helper};
2526
use std::fs;
2627
use std::process;
@@ -61,6 +62,8 @@ struct Completes {
6162
file_completer: FilenameCompleter,
6263
}
6364

65+
impl Validator for Completes {}
66+
6467
impl Helper for Completes {}
6568

6669
impl Hinter for Completes {

0 commit comments

Comments
 (0)