Skip to content

Commit

Permalink
Auto merge of #721 - GrigorenkoPV:stdsimd, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix: unknown feature `stdsimd`
  • Loading branch information
bors committed Feb 26, 2024
2 parents 4dbd62a + 3c7a814 commit 5f8077a
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 38 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/agent/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use crate::utils::disk_usage::DiskUsage;
use failure::Error;
use rustwide::Workspace;
use std::collections::BTreeSet;
use std::iter::FromIterator;
use std::ops;
use std::sync::atomic::{AtomicBool, Ordering};
use std::thread;
Expand Down
2 changes: 1 addition & 1 deletion src/assets.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::prelude::*;
use mime::{self, Mime};
use mime::Mime;
use serde::Serialize;
use std::borrow::Cow;
use std::collections::HashMap;
Expand Down
10 changes: 0 additions & 10 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ use std::time::Duration;
#[derive(Debug, Clone)]
pub struct Ex(String);

#[derive(Debug, Clone)]
pub struct DockerEnv(String);
impl FromStr for Ex {
type Err = Error;

Expand All @@ -43,14 +41,6 @@ impl FromStr for Ex {
}
}

impl FromStr for DockerEnv {
type Err = Error;

fn from_str(env: &str) -> Fallible<DockerEnv> {
Ok(DockerEnv(env.to_string()))
}
}

#[derive(Debug, Clone)]
pub struct Dest(PathBuf);

Expand Down
1 change: 0 additions & 1 deletion src/crates/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use crate::prelude::*;
use cargo_metadata::PackageId;
use percent_encoding::{percent_decode_str, utf8_percent_encode, NON_ALPHANUMERIC};
use rustwide::Crate as RustwideCrate;
use std::convert::TryFrom;
use std::fmt;
use std::path::Path;
use std::str::FromStr;
Expand Down
5 changes: 1 addition & 4 deletions src/db/migrations.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use crate::prelude::*;
use rand::{
self,
distributions::{Alphanumeric, DistString},
};
use rand::distributions::{Alphanumeric, DistString};
use rusqlite::{Connection, Transaction};
use std::collections::HashSet;

Expand Down
3 changes: 1 addition & 2 deletions src/report/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ use crate::results::{EncodedLog, EncodingType, FailureReason, ReadResults, TestR
use crate::toolchain::Toolchain;
use crate::utils;
use crates_index::GitIndex;
use mime::{self, Mime};
use mime::Mime;
use percent_encoding::{utf8_percent_encode, AsciiSet};
use std::borrow::Cow;
#[cfg(test)]
use std::collections::HashMap;
use std::convert::AsRef;
use std::fmt::{self, Display};
use std::fs;
use std::path::{Path, PathBuf};
Expand Down
1 change: 0 additions & 1 deletion src/runner/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use rustwide::cmd::{CommandError, ProcessLinesActions, SandboxBuilder};
use rustwide::logging::LogStorage;
use rustwide::{Build, PrepareError};
use std::collections::{BTreeSet, HashMap, HashSet};
use std::convert::TryFrom;

fn failure_reason(err: &Error) -> FailureReason {
for cause in err.iter_chain() {
Expand Down
2 changes: 1 addition & 1 deletion src/server/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use regex::Regex;
use rust_team_data::v1 as team_data;
use std::collections::{HashMap, HashSet};
use std::sync::{Arc, RwLock};
use warp::{self, Filter, Rejection};
use warp::{Filter, Rejection};

lazy_static! {
static ref GIT_REVISION_RE: Regex =
Expand Down
4 changes: 2 additions & 2 deletions src/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ use crate::server::agents::Agents;
use crate::server::auth::ACL;
use crate::server::github::{GitHub, GitHubApi};
use crate::server::tokens::{BotTokens, Tokens};
use http::{self, header::HeaderValue, Response};
use http::{header::HeaderValue, Response};
use hyper::Body;
use metrics::Metrics;
use std::net::SocketAddr;
use std::sync::{Arc, Mutex};
use warp::{self, Filter};
use warp::Filter;

lazy_static! {
static ref SERVER_HEADER: String =
Expand Down
2 changes: 1 addition & 1 deletion src/server/routes/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use hyper::Body;
use std::collections::HashMap;
use std::sync::{Arc, Condvar, Mutex};
use std::time::Instant;
use warp::{self, Filter, Rejection};
use warp::{Filter, Rejection};

#[derive(Deserialize)]
#[serde(rename_all = "kebab-case")]
Expand Down
2 changes: 1 addition & 1 deletion src/server/routes/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use http::{Response, StatusCode};
use hyper::Body;
use prometheus::{Encoder, TextEncoder};
use std::sync::Arc;
use warp::{self, Filter, Rejection};
use warp::{Filter, Rejection};

pub fn routes(
data: Arc<Data>,
Expand Down
2 changes: 1 addition & 1 deletion src/server/routes/ui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use http::{Response, StatusCode};
use hyper::Body;
use serde::Serialize;
use std::sync::Arc;
use warp::{self, Filter, Rejection};
use warp::{Filter, Rejection};

mod agents;
mod experiments;
Expand Down
1 change: 0 additions & 1 deletion src/server/routes/webhooks/args.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use crate::experiments::{Assignee, CapLints, DeferredCrateSelect, Mode};
use crate::toolchain::Toolchain;
use failure::{self, Fallible};

#[derive(Debug, thiserror::Error)]
#[cfg_attr(test, derive(PartialEq, Eq))]
Expand Down
2 changes: 1 addition & 1 deletion src/server/routes/webhooks/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use http::{HeaderMap, Response, StatusCode};
use hyper::Body;
use std::str::FromStr;
use std::sync::Arc;
use warp::{self, Filter, Rejection};
use warp::{Filter, Rejection};

fn process_webhook(
payload: &[u8],
Expand Down
2 changes: 1 addition & 1 deletion src/utils/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::prelude::*;
use failure::{AsFail, Backtrace, Fail};
use failure::{AsFail, Backtrace};
use percent_encoding::{AsciiSet, CONTROLS};
use std::any::Any;
use std::fmt;
Expand Down
1 change: 0 additions & 1 deletion src/utils/serialize.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use serde::ser::{Serialize, SerializeSeq, Serializer};
use std::iter::IntoIterator;

pub fn to_vec<S, T>(data: T, serializer: S) -> Result<S::Ok, S::Error>
where
Expand Down

0 comments on commit 5f8077a

Please sign in to comment.