Skip to content

Commit b9f54d2

Browse files
committed
Upgrade rust toolchains
1 parent b002e79 commit b9f54d2

20 files changed

+15
-38
lines changed

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
language: rust
22
rust:
3-
- 1.38.0
3+
- 1.42.0
44
jobs:
55
include:
66
- name: server
77
before_install:
88
- cd $TRAVIS_JOB_NAME
99
install:
1010
- rustup set profile minimal
11-
- rustup toolchain install nightly-2019-10-13
12-
- rustup component add rustfmt-preview --toolchain nightly-2019-10-13
13-
- rustup component add clippy-preview --toolchain nightly-2019-10-13
11+
- rustup toolchain install nightly-2020-02-23
12+
- rustup component add rustfmt-preview --toolchain nightly-2020-02-23
13+
- rustup component add clippy-preview --toolchain nightly-2020-02-23
1414
before_script:
1515
- cargo fetch --verbose
1616
script:
17-
- cargo +nightly-2019-10-13 fmt -- --check
17+
- cargo +nightly-2020-02-23 fmt -- --check
1818
&& RUST_BACKTRACE=1 cargo test --verbose --all
19-
&& cargo +nightly-2019-10-13 clippy --all --all-targets -- -D warnings
19+
&& cargo +nightly-2020-02-23 clippy --all --all-targets -- -D warnings
2020
- name: client
2121
before_install:
2222
- cd $TRAVIS_JOB_NAME
2323
install:
2424
- rustup set profile minimal
25-
- rustup toolchain install nightly-2019-10-13
26-
- rustup component add rustfmt-preview --toolchain nightly-2019-10-13
27-
- rustup component add clippy-preview --toolchain nightly-2019-10-13
25+
- rustup toolchain install nightly-2020-02-23
26+
- rustup component add rustfmt-preview --toolchain nightly-2020-02-23
27+
- rustup component add clippy-preview --toolchain nightly-2020-02-23
2828
before_script:
2929
- cargo fetch --verbose
3030
script:
31-
- cargo +nightly-2019-10-13 fmt -- --check
31+
- cargo +nightly-2020-02-23 fmt -- --check
3232
&& RUST_BACKTRACE=1 cargo test --verbose --all
33-
&& cargo +nightly-2019-10-13 clippy --all --all-targets -- -D warnings
33+
&& cargo +nightly-2020-02-23 clippy --all --all-targets -- -D warnings
3434
- name: ui
3535
before_install:
3636
- cd $TRAVIS_JOB_NAME

client/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.38.0
1+
1.42.0

client/src/handler.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use super::types::HandlerContext;
33
use jsonrpc_core::types::{
44
Call, Error as JSONRPCError, ErrorCode, Failure, Id, MethodCall, Response, Success, Version,
55
};
6-
use serde_json;
76
use std::cell::Cell;
87
use std::rc::Rc;
98
use std::sync::Arc;

client/src/hardware_usage.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use crossbeam::channel::{Receiver, Sender};
22
use crossbeam::{channel, select};
33
use parking_lot::Mutex;
44
use serde_derive::Serialize;
5-
use std::error::Error;
65
use std::sync::Arc;
76
use std::thread;
87
use std::time::Duration;
@@ -81,12 +80,12 @@ impl HardwareService {
8180

8281
fn prepare_cpu_usage(&self) -> Result<CpuMeasurement, String> {
8382
let sys = systemstat::System::new();
84-
Ok(sys.cpu_load().map_err(|err| err.description().to_string())?)
83+
Ok(sys.cpu_load().map_err(|err| err.to_string())?)
8584
}
8685

8786
fn update(&mut self, cpu_measure: Option<CpuMeasurement>, sysinfo_sys: &mut sysinfo::System) -> Result<(), String> {
8887
let cpu_usage = if let Some(measure) = cpu_measure {
89-
let cpu = measure.done().map_err(|err| err.description().to_string())?;
88+
let cpu = measure.done().map_err(|err| err.to_string())?;
9089
cpu.iter().map(|core| f64::from(core.user + core.system)).collect()
9190
} else {
9291
Vec::new()

client/src/logger/logger.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
use atty;
21
use colored::Colorize;
32
use env_logger::filter::{Builder as FilterBuilder, Filter};
43
use log::{LevelFilter, Log, Metadata, Record};
54
use std::{env, thread};
6-
use time;
75

86
pub struct Logger {
97
filter: Filter,

client/src/process/binary_update.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::update::{CallbackResult, Sender};
22
use super::{fs_util, Error};
3-
use crossbeam;
43
use std::thread;
54

65
pub struct Job {}

client/src/process/git_update.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use super::super::types::CommitHash;
22
use super::update::{CallbackResult, Sender};
33
use super::{git_util, Error};
4-
use crossbeam;
54
use std::thread;
65

76
pub struct Job {}

client/src/process/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use std::sync::Arc;
2222
use std::time::Duration;
2323
use std::{fs, thread};
2424
use subprocess::{Exec, ExitStatus, PopenError};
25-
use toml;
2625

2726
#[derive(Debug)]
2827
pub enum Error {

client/src/process/rpc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use jsonrpc_core;
21
use jsonrpc_core::types::Version;
32
use parking_lot::Mutex;
43
use serde_json::{Error as SerdeError, Value};

server/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.38.0
1+
1.42.0

0 commit comments

Comments
 (0)