Skip to content

Commit 24e9ce0

Browse files
borsbors
committed
Auto merge of #377 - pietroalbini:edition-2018, r=pietroalbini
Migrate to Rust 2018 This PR migrates Crater to Rust 2018. Mostly `cargo fix`, `cargo fmt` and a little manual fixing inside macros and `#[macro_use]`.
2 parents 534790f + dca946a commit 24e9ce0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+450
-495
lines changed

‎Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
[package]
22
name = "crater"
33
version = "0.1.0"
4-
authors = ["Brian Anderson <banderson@mozilla.com>"]
4+
authors = [
5+
"Brian Anderson <banderson@mozilla.com>",
6+
"Pietro Albini <pietro@pietroalbini.org>",
7+
]
8+
edition = "2018"
59

610
build = "build.rs"
711

‎src/actions/experiments/create.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use actions::experiments::ExperimentError;
1+
use crate::actions::experiments::ExperimentError;
2+
use crate::config::Config;
3+
use crate::db::{Database, QueryUtils};
4+
use crate::experiments::{CapLints, CrateSelect, Experiment, GitHubIssue, Mode, Status};
5+
use crate::prelude::*;
6+
use crate::toolchain::Toolchain;
27
use chrono::Utc;
3-
use config::Config;
4-
use db::{Database, QueryUtils};
5-
use experiments::{CapLints, CrateSelect, Experiment, GitHubIssue, Mode, Status};
6-
use prelude::*;
7-
use toolchain::Toolchain;
88

99
pub struct CreateExperiment {
1010
pub name: String,
@@ -19,7 +19,7 @@ pub struct CreateExperiment {
1919
impl CreateExperiment {
2020
#[cfg(test)]
2121
pub fn dummy(name: &str) -> Self {
22-
use toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
22+
use crate::toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
2323

2424
CreateExperiment {
2525
name: name.to_string(),
@@ -43,7 +43,7 @@ impl CreateExperiment {
4343
return Err(ExperimentError::DuplicateToolchains.into());
4444
}
4545

46-
let crates = ::crates::lists::get_crates(self.crates, db, config)?;
46+
let crates = crate::crates::lists::get_crates(self.crates, db, config)?;
4747

4848
db.transaction(|transaction| {
4949
transaction.execute(
@@ -84,18 +84,18 @@ impl CreateExperiment {
8484
#[cfg(test)]
8585
mod tests {
8686
use super::CreateExperiment;
87-
use actions::ExperimentError;
88-
use config::Config;
89-
use db::Database;
90-
use experiments::{CapLints, CrateSelect, Experiment, GitHubIssue, Mode, Status};
91-
use toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
87+
use crate::actions::ExperimentError;
88+
use crate::config::Config;
89+
use crate::db::Database;
90+
use crate::experiments::{CapLints, CrateSelect, Experiment, GitHubIssue, Mode, Status};
91+
use crate::toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
9292

9393
#[test]
9494
fn test_creation() {
9595
let db = Database::temp().unwrap();
9696
let config = Config::default();
9797

98-
::crates::lists::setup_test_lists(&db, &config).unwrap();
98+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
9999

100100
let api_url = "https://api.github.com/repos/example/example/issues/10";
101101
let html_url = "https://github.com/example/example/issue/10";
@@ -125,7 +125,7 @@ mod tests {
125125
assert_eq!(ex.mode, Mode::BuildAndTest);
126126
assert_eq!(
127127
ex.crates,
128-
::crates::lists::get_crates(CrateSelect::Local, &db, &config).unwrap()
128+
crate::crates::lists::get_crates(CrateSelect::Local, &db, &config).unwrap()
129129
);
130130
assert_eq!(ex.cap_lints, CapLints::Forbid);
131131
assert_eq!(ex.github_issue.as_ref().unwrap().api_url.as_str(), api_url);
@@ -144,7 +144,7 @@ mod tests {
144144
let db = Database::temp().unwrap();
145145
let config = Config::default();
146146

147-
::crates::lists::setup_test_lists(&db, &config).unwrap();
147+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
148148

149149
// Ensure an experiment with duplicate toolchains can't be created
150150
let err = CreateExperiment {
@@ -170,7 +170,7 @@ mod tests {
170170
let db = Database::temp().unwrap();
171171
let config = Config::default();
172172

173-
::crates::lists::setup_test_lists(&db, &config).unwrap();
173+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
174174

175175
// The first experiment can be created successfully
176176
CreateExperiment {

‎src/actions/experiments/delete.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use actions::experiments::ExperimentError;
2-
use config::Config;
3-
use db::{Database, QueryUtils};
4-
use experiments::Experiment;
5-
use prelude::*;
1+
use crate::actions::experiments::ExperimentError;
2+
use crate::config::Config;
3+
use crate::db::{Database, QueryUtils};
4+
use crate::experiments::Experiment;
5+
use crate::prelude::*;
66

77
pub struct DeleteExperiment {
88
pub name: String,
@@ -25,10 +25,10 @@ impl DeleteExperiment {
2525
#[cfg(test)]
2626
mod tests {
2727
use super::DeleteExperiment;
28-
use actions::{CreateExperiment, ExperimentError};
29-
use config::Config;
30-
use db::Database;
31-
use experiments::Experiment;
28+
use crate::actions::{CreateExperiment, ExperimentError};
29+
use crate::config::Config;
30+
use crate::db::Database;
31+
use crate::experiments::Experiment;
3232

3333
#[test]
3434
fn test_delete_missing_experiment() {
@@ -52,7 +52,7 @@ mod tests {
5252
let db = Database::temp().unwrap();
5353
let config = Config::default();
5454

55-
::crates::lists::setup_test_lists(&db, &config).unwrap();
55+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
5656

5757
// Create a dummy experiment and make sure it exists
5858
CreateExperiment::dummy("dummy")

‎src/actions/experiments/edit.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use actions::experiments::ExperimentError;
2-
use config::Config;
3-
use db::{Database, QueryUtils};
4-
use experiments::{CapLints, CrateSelect, Experiment, Mode, Status};
5-
use prelude::*;
6-
use toolchain::Toolchain;
1+
use crate::actions::experiments::ExperimentError;
2+
use crate::config::Config;
3+
use crate::db::{Database, QueryUtils};
4+
use crate::experiments::{CapLints, CrateSelect, Experiment, Mode, Status};
5+
use crate::prelude::*;
6+
use crate::toolchain::Toolchain;
77

88
pub struct EditExperiment {
99
pub name: String,
@@ -63,7 +63,7 @@ impl EditExperiment {
6363

6464
// Try to update the list of crates
6565
if let Some(crates) = self.crates {
66-
let crates_vec = ::crates::lists::get_crates(crates, db, config)?;
66+
let crates_vec = crate::crates::lists::get_crates(crates, db, config)?;
6767

6868
// Recreate the list of crates without checking if it was the same
6969
// This is done to allow reloading the list of crates in an existing experiment
@@ -131,18 +131,18 @@ impl EditExperiment {
131131
#[cfg(test)]
132132
mod tests {
133133
use super::EditExperiment;
134-
use actions::{CreateExperiment, ExperimentError};
135-
use config::Config;
136-
use db::Database;
137-
use experiments::{CapLints, CrateSelect, Experiment, Mode, Status};
138-
use toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
134+
use crate::actions::{CreateExperiment, ExperimentError};
135+
use crate::config::Config;
136+
use crate::db::Database;
137+
use crate::experiments::{CapLints, CrateSelect, Experiment, Mode, Status};
138+
use crate::toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
139139

140140
#[test]
141141
fn test_edit_with_no_changes() {
142142
let db = Database::temp().unwrap();
143143
let config = Config::default();
144144

145-
::crates::lists::setup_test_lists(&db, &config).unwrap();
145+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
146146

147147
// Create a dummy experiment to edit
148148
CreateExperiment::dummy("foo").apply(&db, &config).unwrap();
@@ -157,7 +157,7 @@ mod tests {
157157
let db = Database::temp().unwrap();
158158
let config = Config::default();
159159

160-
::crates::lists::setup_test_lists(&db, &config).unwrap();
160+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
161161

162162
// Create an experiment with the data we're going to change
163163
CreateExperiment {
@@ -198,7 +198,7 @@ mod tests {
198198

199199
assert_eq!(
200200
ex.crates,
201-
::crates::lists::get_crates(CrateSelect::Local, &db, &config).unwrap()
201+
crate::crates::lists::get_crates(CrateSelect::Local, &db, &config).unwrap()
202202
);
203203
}
204204

@@ -207,7 +207,7 @@ mod tests {
207207
let db = Database::temp().unwrap();
208208
let config = Config::default();
209209

210-
::crates::lists::setup_test_lists(&db, &config).unwrap();
210+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
211211

212212
// First create an experiment
213213
let mut dummy = CreateExperiment::dummy("foo");
@@ -230,7 +230,7 @@ mod tests {
230230
let db = Database::temp().unwrap();
231231
let config = Config::default();
232232

233-
::crates::lists::setup_test_lists(&db, &config).unwrap();
233+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
234234

235235
let err = EditExperiment::dummy("foo")
236236
.apply(&db, &config)
@@ -246,7 +246,7 @@ mod tests {
246246
let db = Database::temp().unwrap();
247247
let config = Config::default();
248248

249-
::crates::lists::setup_test_lists(&db, &config).unwrap();
249+
crate::crates::lists::setup_test_lists(&db, &config).unwrap();
250250

251251
// Create an experiment and set it to running
252252
CreateExperiment::dummy("foo").apply(&db, &config).unwrap();

‎src/actions/experiments/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub use self::create::CreateExperiment;
66
pub use self::delete::DeleteExperiment;
77
pub use self::edit::EditExperiment;
88

9-
#[derive(Debug, Fail)]
9+
#[derive(Debug, failure::Fail)]
1010
#[cfg_attr(test, derive(PartialEq, Eq))]
1111
pub enum ExperimentError {
1212
#[fail(display = "experiment '{}' not found", _0)]

‎src/actions/lists/update.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use config::Config;
2-
use crates::lists::{GitHubList, List, LocalList, RegistryList};
3-
use db::Database;
4-
use prelude::*;
1+
use crate::config::Config;
2+
use crate::crates::lists::{GitHubList, List, LocalList, RegistryList};
3+
use crate::db::Database;
4+
use crate::prelude::*;
55

66
pub struct UpdateLists {
77
pub github: bool,

‎src/agent/api.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
use crate::crates::{Crate, GitHubRepo};
2+
use crate::experiments::Experiment;
3+
use crate::prelude::*;
4+
use crate::results::TestResult;
5+
use crate::server::api_types::{AgentConfig, ApiResponse, CraterToken};
6+
use crate::toolchain::Toolchain;
7+
use crate::utils;
18
use base64;
2-
use crates::{Crate, GitHubRepo};
3-
use experiments::Experiment;
49
use http::{header::AUTHORIZATION, Method, StatusCode};
5-
use prelude::*;
610
use reqwest::RequestBuilder;
7-
use results::TestResult;
811
use serde::de::DeserializeOwned;
9-
use server::api_types::{AgentConfig, ApiResponse, CraterToken};
10-
use toolchain::Toolchain;
11-
use utils::http;
12+
use serde_json::json;
1213

1314
#[derive(Debug, Fail)]
1415
pub enum AgentApiError {
@@ -75,7 +76,7 @@ impl AgentApi {
7576
}
7677

7778
fn build_request(&self, method: Method, url: &str) -> RequestBuilder {
78-
http::prepare_sync(method, &format!("{}/agent-api/{}", self.url, url)).header(
79+
utils::http::prepare_sync(method, &format!("{}/agent-api/{}", self.url, url)).header(
7980
AUTHORIZATION,
8081
(CraterToken {
8182
token: self.token.clone(),

‎src/agent/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
mod api;
22
mod results;
33

4-
use agent::api::AgentApi;
5-
use config::Config;
6-
use experiments::Experiment;
7-
use prelude::*;
4+
use crate::agent::api::AgentApi;
5+
use crate::config::Config;
6+
use crate::experiments::Experiment;
7+
use crate::prelude::*;
8+
use crate::utils;
89
use std::thread;
910
use std::time::Duration;
10-
use utils;
1111

1212
struct Agent {
1313
api: AgentApi,
@@ -55,7 +55,7 @@ pub fn run(url: &str, token: &str, threads_count: usize, docker_env: &str) -> Fa
5555

5656
loop {
5757
let ex = agent.experiment()?;
58-
::runner::run_ex(&ex, &db, threads_count, &agent.config, docker_env)?;
58+
crate::runner::run_ex(&ex, &db, threads_count, &agent.config, docker_env)?;
5959
agent.api.complete_experiment()?;
6060
}
6161
}

‎src/agent/results.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
use agent::api::AgentApi;
2-
use crates::{Crate, GitHubRepo};
3-
use experiments::Experiment;
4-
use log;
5-
use prelude::*;
6-
use results::{TestResult, WriteResults};
1+
use crate::agent::api::AgentApi;
2+
use crate::crates::{Crate, GitHubRepo};
3+
use crate::experiments::Experiment;
4+
use crate::log;
5+
use crate::prelude::*;
6+
use crate::results::{TestResult, WriteResults};
7+
use crate::toolchain::Toolchain;
78
use std::io::Read;
89
use std::ops::DerefMut;
910
use std::sync::{Arc, Mutex};
10-
use toolchain::Toolchain;
1111

1212
#[derive(Clone)]
1313
pub struct ResultsUploader<'a> {

‎src/assets.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::prelude::*;
12
use mime::{self, Mime};
2-
use prelude::*;
33
use serde::Serialize;
44
use std::borrow::Cow;
55
use std::collections::HashMap;
@@ -11,8 +11,8 @@ lazy_static! {
1111
static ref TERA_CACHE: Tera = match build_tera_cache() {
1212
Ok(tera) => tera,
1313
Err(err) => {
14-
::utils::report_failure(&err);
15-
::std::process::exit(1);
14+
crate::utils::report_failure(&err);
15+
std::process::exit(1);
1616
}
1717
};
1818
}

0 commit comments

Comments
 (0)