Merge pull request #1948 from klensy/cleanup-2

drop protobuf and derive_more from deps

Author: Kobzol

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.70.0
+          toolchain: 1.73.0
           override: true
           components: rustfmt, clippy
 

Cargo.lock

@@ -37,7 +37,7 @@ thousands = "0.2.0"
 rustc-demangle = { version = "0.1", features = ["std"] }
 similar = "2.2"
 console = "0.15"
-object = "0.32.1"
+object = "0.36.0"
 tabled = { version = "0.14.0", features = ["ansi-str"] }
 humansize = "2.1.3"
 regex = "1.7.1"

collector/Cargo.toml

@@ -108,7 +108,7 @@ static RUSTC_HASH_REGEX: OnceLock<Regex> = OnceLock::new();
 /// Demangle the symbol and remove rustc mangling hashes.
 fn normalize_symbol_name(symbol: &str) -> String {
     let regex =
-        RUSTC_HASH_REGEX.get_or_init(|| Regex::new(r#"(::)?\b[a-z0-9]{15,17}\b(\.\d+)?"#).unwrap());
+        RUSTC_HASH_REGEX.get_or_init(|| Regex::new(r"(::)?\b[a-z0-9]{15,17}\b(\.\d+)?").unwrap());
 
     let symbol = rustc_demangle::demangle(symbol).to_string();
     regex.replace_all(&symbol, "").to_string()

collector/src/artifact_stats.rs

@@ -1371,7 +1371,7 @@ fn print_binary_stats(
     // Fill in items from the second artifact that are not present in the first one
     if use_diff {
         for (section, size) in items2 {
-            if items.get(&section).is_none() {
+            if !items.contains_key(&section) {
                 rows.push(Row {
                     name: section,
                     before: 0,

collector/src/bin/collector.rs

@@ -209,7 +209,7 @@ fn execute_runtime_benchmark_binary(
     let mut command = prepare_command(binary);
     command.arg("run");
     command.arg("--iterations");
-    command.arg(&iterations.to_string());
+    command.arg(iterations.to_string());
 
     if !filter.exclude.is_empty() {
         command.args(["--exclude", &filter.exclude.join(",")]);

collector/src/runtime/mod.rs

@@ -13,7 +13,7 @@ pub fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> anyhow::Result<
     let ctx = format!("renaming file {:?} to {:?}", from, to);
 
     if fs::metadata(from)?.is_file() {
-        return Ok(fs::rename(from, to).with_context(|| ctx.clone())?);
+        return fs::rename(from, to).with_context(|| ctx.clone());
     }
 
     robocopy(from, to, &[&"/move"]).with_context(|| ctx.clone())

collector/src/utils/fs.rs

@@ -158,7 +158,7 @@ mod imp {
     impl<'a> Pipe<'a> {
         unsafe fn new<P: IntoRawHandle>(p: P, dst: &'a mut Vec<u8>) -> Pipe<'a> {
             Pipe {
-                dst: dst,
+                dst,
                 pipe: NamedPipe::from_raw_handle(p.into_raw_handle()),
                 overlapped: Overlapped::zero(),
                 done: false,
@@ -196,9 +196,6 @@ mod imp {
         if v.capacity() == v.len() {
             v.reserve(1);
         }
-        slice::from_raw_parts_mut(
-            v.as_mut_ptr().offset(v.len() as isize),
-            v.capacity() - v.len(),
-        )
+        slice::from_raw_parts_mut(v.as_mut_ptr().add(v.len()), v.capacity() - v.len())
     }
 }

collector/src/utils/read2.rs

@@ -717,6 +717,8 @@ impl Connection for SqliteConnection {
         _profile: Profile,
         _scenario: crate::Scenario,
     ) {
+        #![allow(clippy::diverging_sub_expression)]
+
         // FIXME: this is left for the future, if we ever need to support it. It
         // shouldn't be too hard, but we may also want to just intern the raw
         // self profile files into sqlite database or something like that, not

database/src/pool/sqlite.rs

@@ -39,13 +39,14 @@ url = "2"
 analyzeme = "12.0.0"
 inferno = { version = "0.11", default-features = false }
 mime = "0.3"
-prometheus = "0.13"
+# prometheus currently uses plain text, so disable protobuf
+prometheus = { version = "0.13", default-features = false }
 uuid = { version = "1.3.0", features = ["v4"] }
 tera = { version = "1.19", default-features = false }
 rust-embed = { version = "6.6.0", features = ["include-exclude", "interpolate-folder-path"] }
 humansize = "2"
 lru = "0.12.0"
-ruzstd = "0.6.0"
+ruzstd = "0.7.0"
 
 [target.'cfg(unix)'.dependencies]
 jemallocator = "0.5"

site/Cargo.toml

@@ -197,9 +197,9 @@ pub struct UnrolledCommit<'a> {
 
 lazy_static::lazy_static! {
     static ref ROLLUP_PR_NUMBER: regex::Regex =
-        regex::Regex::new(r#"^Auto merge of #(\d+)"#).unwrap();
+        regex::Regex::new(r"^Auto merge of #(\d+)").unwrap();
     static ref ROLLEDUP_PR_NUMBER: regex::Regex =
-        regex::Regex::new(r#"^Rollup merge of #(\d+)"#).unwrap();
+        regex::Regex::new(r"^Rollup merge of #(\d+)").unwrap();
 }
 
 // Gets the pr number for the associated rollup PR message. Returns None if this is not a rollup PR

site/src/github.rs

@@ -11,9 +11,9 @@ use regex::Regex;
 
 lazy_static::lazy_static! {
     static ref BODY_TIMER_BUILD: Regex =
-        Regex::new(r#"(?:\W|^)@rust-timer\s+build\s+(\w+)(?:\W|$)(?:include=(\S+))?\s*(?:exclude=(\S+))?\s*(?:runs=(\d+))?"#).unwrap();
+        Regex::new(r"(?:\W|^)@rust-timer\s+build\s+(\w+)(?:\W|$)(?:include=(\S+))?\s*(?:exclude=(\S+))?\s*(?:runs=(\d+))?").unwrap();
     static ref BODY_TIMER_QUEUE: Regex =
-        Regex::new(r#"(?:\W|^)@rust-timer\s+queue(?:\W|$)(?:include=(\S+))?\s*(?:exclude=(\S+))?\s*(?:runs=(\d+))?"#).unwrap();
+        Regex::new(r"(?:\W|^)@rust-timer\s+queue(?:\W|$)(?:include=(\S+))?\s*(?:exclude=(\S+))?\s*(?:runs=(\d+))?").unwrap();
 }
 
 pub async fn handle_github(