Skip to content

Commit afd8d32

Browse files
committed
Auto merge of #704 - Mark-Simulacrum:bump-deps, r=Mark-Simulacrum
Bump a host of dependencies to newer versions
2 parents f9dfaa6 + 7491443 commit afd8d32

File tree

13 files changed

+1803
-825
lines changed

13 files changed

+1803
-825
lines changed

Cargo.lock

Lines changed: 1745 additions & 779 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ build = "build.rs"
99
opt-level = 0
1010

1111
[dependencies]
12-
base64 = "0.20.0"
12+
base64 = "0.21.5"
1313
bytes = "1"
1414
chrono = { version = "0.4", features = ["serde"] }
15-
crates-index = "0.18"
15+
crates-index = { version = "2.2.0", default-features = false, features = ["git-performance", "git-https"] }
1616
crossbeam-channel = "0.5"
1717
csv = "1.0.2"
1818
docsrs-metadata = { git = "https://github.com/rust-lang/docs.rs/" }
@@ -25,8 +25,8 @@ lazy_static = "1.0"
2525
mime = "0.3.1"
2626
minifier = { version = "0.2", features = ["html"] }
2727
r2d2 = "0.8.2"
28-
r2d2_sqlite = "0.21.0"
29-
rusqlite = { version = "0.28.0", features = ["chrono", "functions", "bundled"] }
28+
r2d2_sqlite = "0.22.0"
29+
rusqlite = { version = "0.29.0", features = ["chrono", "functions", "bundled"] }
3030
rand = "0.8"
3131
regex = "1.0"
3232
reqwest = { version = "0.11", features = ["blocking", "json"] }
@@ -38,7 +38,7 @@ clap = { version = "4", features = ["derive"] }
3838
tar = "0.4.36"
3939
tempfile = "3.0.0"
4040
tera = "0.11.7"
41-
toml = "0.4.6"
41+
toml = "0.8.6"
4242
url = "2"
4343
walkdir = "2"
4444
warp = "0.3"
@@ -48,21 +48,21 @@ hmac = "0.12"
4848
sha-1 = "0.10"
4949
rust_team_data = { git = "https://github.com/rust-lang/team" }
5050
systemstat = "0.1.11"
51-
rustwide = { version = "0.15.0", features = ["unstable", "unstable-toolchain-ci"] }
51+
rustwide = { version = "0.16.0", features = ["unstable", "unstable-toolchain-ci"] }
5252
percent-encoding = "2.1.0"
5353
remove_dir_all = "0.7"
5454
ctrlc = "3.1.3"
55-
prometheus = "0.7.0"
56-
cargo_metadata = "0.15"
57-
indexmap = "1.4.0"
55+
prometheus = "0.13.3"
56+
cargo_metadata = "0.18.1"
57+
indexmap = { version = "2.0.2", features = ["serde"] }
5858
tokio = "1.24"
59-
aws-types = { version = "0.52", features = ["hardcoded-credentials"] }
60-
aws-smithy-http = "0.52"
61-
aws-smithy-async = "0.52"
62-
aws-sdk-s3 = "0.22"
59+
aws-types = "0.56.1"
60+
aws-credential-types = "0.56.1"
61+
aws-smithy-async = "0.56.1"
62+
aws-sdk-s3 = "0.34"
6363
thiserror = "1.0.38"
6464

6565
[dev-dependencies]
6666
assert_cmd = "2.0.4"
6767
difference = "2.0.0"
68-
predicates = "2.0.0"
68+
predicates = "3.0.4"

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
1313
build-essential \
1414
git \
1515
pkg-config \
16+
cmake \
1617
libsqlite3-dev \
1718
libssl-dev
1819

src/agent/api.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::results::TestResult;
88
use crate::server::api_types::{AgentConfig, ApiResponse, CraterToken};
99
use crate::toolchain::Toolchain;
1010
use crate::utils;
11+
use base64::Engine;
1112
use rand::Rng;
1213
use reqwest::blocking::RequestBuilder;
1314
use reqwest::header::AUTHORIZATION;
@@ -186,7 +187,7 @@ impl AgentApi {
186187
"crate": krate,
187188
"toolchain": toolchain,
188189
"result": result,
189-
"log": base64::encode(log),
190+
"log": base64::engine::general_purpose::STANDARD.encode(log),
190191
},
191192
],
192193
"version": version

src/crates/sources/registry.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::crates::{lists::List, Crate};
22
use crate::dirs::WORK_DIR;
33
use crate::prelude::*;
4-
use crates_index::Index;
4+
use crates_index::GitIndex;
55
use std::collections::HashMap;
66
use std::fs::{self};
77

@@ -15,7 +15,7 @@ impl List for RegistryList {
1515
let mut counts = HashMap::new();
1616

1717
fs::create_dir_all(&*WORK_DIR)?;
18-
let mut index = Index::with_path(
18+
let mut index = GitIndex::with_path(
1919
WORK_DIR.join("crates.io-index"),
2020
"https://github.com/rust-lang/crates.io-index",
2121
)

src/report/mod.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::report::analyzer::{analyze_report, ReportConfig, ToolchainSelect};
77
use crate::results::{EncodedLog, EncodingType, FailureReason, ReadResults, TestResult};
88
use crate::toolchain::Toolchain;
99
use crate::utils;
10-
use crates_index::Index;
10+
use crates_index::GitIndex;
1111
use mime::{self, Mime};
1212
use percent_encoding::{utf8_percent_encode, AsciiSet};
1313
use std::borrow::Cow;
@@ -182,7 +182,10 @@ fn crate_to_path_fragment(
182182
path
183183
}
184184

185-
fn get_crate_version_status(index: &Index, krate: &Crate) -> Fallible<Option<CrateVersionStatus>> {
185+
fn get_crate_version_status(
186+
index: &GitIndex,
187+
krate: &Crate,
188+
) -> Fallible<Option<CrateVersionStatus>> {
186189
if let Crate::Registry(krate) = krate {
187190
let index_krate = index
188191
.crate_(&krate.name)
@@ -217,7 +220,7 @@ pub fn generate_report<DB: ReadResults>(
217220
crates: &[Crate],
218221
) -> Fallible<RawTestResults> {
219222
let mut crates = crates.to_vec();
220-
let index = Index::with_path(
223+
let index = GitIndex::with_path(
221224
WORK_DIR.join("crates.io-index"),
222225
"https://github.com/rust-lang/crates.io-index",
223226
)
@@ -616,7 +619,7 @@ mod tests {
616619
use crate::experiments::{CapLints, Experiment, Mode, Status};
617620
use crate::results::{BrokenReason, DummyDB, FailureReason, TestResult};
618621
use crate::toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
619-
use crates_index::Index;
622+
use crates_index::GitIndex;
620623

621624
#[test]
622625
fn test_crate_to_path_fragment() {
@@ -698,12 +701,11 @@ mod tests {
698701
};
699702
let gh = Crate::GitHub(repo);
700703

701-
let mut index = Index::with_path(
704+
let index = GitIndex::with_path(
702705
WORK_DIR.join("crates.io-index"),
703706
"https://github.com/rust-lang/crates.io-index",
704707
)
705708
.unwrap();
706-
index.update().unwrap();
707709

708710
assert_eq!(
709711
get_crate_version_status(&index, &reg).unwrap().unwrap(),

src/report/s3.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl ReportWriter for S3Writer {
8686
let mut request = self
8787
.client
8888
.create_multipart_upload()
89-
.acl(aws_sdk_s3::model::ObjectCannedAcl::PublicRead)
89+
.acl(aws_sdk_s3::types::ObjectCannedAcl::PublicRead)
9090
.key(format!(
9191
"{}/{}",
9292
self.prefix,
@@ -111,7 +111,7 @@ impl ReportWriter for S3Writer {
111111
let bytes = bytes::Bytes::from(s);
112112
let mut part = 1;
113113
let mut start = 0;
114-
let mut parts = aws_sdk_s3::model::CompletedMultipartUpload::builder();
114+
let mut parts = aws_sdk_s3::types::CompletedMultipartUpload::builder();
115115
while start < bytes.len() {
116116
let chunk = bytes.slice(start..std::cmp::min(start + chunk_size, bytes.len()));
117117

@@ -126,7 +126,7 @@ impl ReportWriter for S3Writer {
126126
match self.runtime.block_on(request.send()) {
127127
Ok(p) => {
128128
parts = parts.parts(
129-
aws_sdk_s3::model::CompletedPart::builder()
129+
aws_sdk_s3::types::CompletedPart::builder()
130130
.e_tag(p.e_tag.clone().unwrap())
131131
.part_number(part)
132132
.build(),
@@ -160,8 +160,8 @@ impl ReportWriter for S3Writer {
160160
let mut request = self
161161
.client
162162
.put_object()
163-
.body(aws_smithy_http::byte_stream::ByteStream::from(s))
164-
.acl(aws_sdk_s3::model::ObjectCannedAcl::PublicRead)
163+
.body(aws_sdk_s3::primitives::ByteStream::from(s))
164+
.acl(aws_sdk_s3::types::ObjectCannedAcl::PublicRead)
165165
.key(format!(
166166
"{}/{}",
167167
self.prefix,

src/results/db.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use crate::results::{
77
DeleteResults, EncodedLog, EncodingType, ReadResults, TestResult, WriteResults,
88
};
99
use crate::toolchain::Toolchain;
10+
use base64::Engine;
1011
use rustwide::logging::{self, LogStorage};
1112

1213
#[derive(Deserialize)]
@@ -89,7 +90,9 @@ impl<'a> DatabaseDB<'a> {
8990
&result.krate,
9091
&result.toolchain,
9192
&result.result,
92-
&base64::decode(&result.log).with_context(|_| "invalid base64 log provided")?,
93+
&base64::engine::general_purpose::STANDARD
94+
.decode(&result.log)
95+
.with_context(|_| "invalid base64 log provided")?,
9396
encoding_type,
9497
)?;
9598

@@ -262,6 +265,8 @@ impl<'a> DeleteResults for DatabaseDB<'a> {
262265

263266
#[cfg(test)]
264267
mod tests {
268+
use base64::Engine;
269+
265270
use super::{DatabaseDB, ProgressData, TaskResult};
266271
use crate::actions::{Action, ActionsCtx, CreateExperiment};
267272
use crate::config::Config;
@@ -468,7 +473,7 @@ mod tests {
468473
krate: updated.clone(),
469474
toolchain: MAIN_TOOLCHAIN.clone(),
470475
result: TestResult::TestPass,
471-
log: base64::encode("foo"),
476+
log: base64::engine::general_purpose::STANDARD.encode("foo"),
472477
}],
473478
version: Some((krate.clone(), updated.clone())),
474479
},

src/server/metrics.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ use crate::prelude::*;
44
use crate::server::agents::Agent;
55
use chrono::{DateTime, Utc};
66
use prometheus::proto::{Metric, MetricFamily};
7-
use prometheus::{
8-
HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, __register_counter_vec,
9-
__register_gauge, __register_gauge_vec, opts, register_counter, register_int_counter,
10-
};
7+
use prometheus::{HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec};
118

129
const JOBS_METRIC: &str = "crater_completed_jobs_total";
1310
const AGENT_WORK_METRIC: &str = "crater_agent_supposed_to_work";
@@ -66,7 +63,7 @@ impl Metrics {
6663
.inc_by(1);
6764
}
6865

69-
pub fn record_completed_jobs(&self, agent: &str, experiment: &str, amount: i64) {
66+
pub fn record_completed_jobs(&self, agent: &str, experiment: &str, amount: u64) {
7067
self.crater_completed_jobs_total
7168
.with_label_values(&[agent, experiment])
7269
.inc_by(amount);

src/server/reports.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ fn generate_report(data: &Data, ex: &Experiment, results: &DatabaseDB) -> Fallib
2424
}
2525
BucketRegion::Custom { url } => {
2626
config.set_region(Some(aws_types::region::Region::from_static("us-east-1")));
27-
config.set_endpoint_resolver(Some(Arc::new(aws_sdk_s3::Endpoint::immutable(url)?)));
27+
config.set_endpoint_url(Some(url.clone()));
2828
}
2929
}
3030
config.set_credentials_provider(Some(data.tokens.reports_bucket.to_aws_credentials()));
3131
// https://github.com/awslabs/aws-sdk-rust/issues/586 -- without this, the
3232
// SDK will just completely not retry requests.
33-
config.set_sleep_impl(Some(Arc::new(
33+
config.set_sleep_impl(Some(aws_sdk_s3::config::SharedAsyncSleep::new(
3434
aws_smithy_async::rt::sleep::TokioSleep::new(),
3535
)));
3636
config.set_retry_config(Some(RetryConfig::standard()));

0 commit comments

Comments
 (0)