Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert most of cdebe0bd661ba9e0b1b8e6a03af38d88fab57f27 #363

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions cargo-test-fuzz/tests/third_party.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,12 @@ mod cheap_tests {
fn test() {
let version_meta = version_meta().unwrap();
for test in TESTS.iter() {
#[allow(clippy::nonminimal_bool)]
run_test(
module_path!(),
test,
test.flags.contains(Flags::EXPENSIVE)
// || test.flags.contains(Flags::SKIP)
// smoelius: Temporarily disable all nightly third-party tests.
// See: https://github.com/tkaitchuck/aHash/issues/200
|| (true // test.flags.contains(Flags::SKIP_NIGHTLY)
|| (test.flags.contains(Flags::SKIP_NIGHTLY)
&& version_meta.channel == Channel::Nightly),
);
}
Expand All @@ -69,21 +66,16 @@ mod cheap_tests {

mod all_tests {
use super::*;

#[cfg_attr(dylint_lib = "supplementary", allow(commented_code))]
#[test]
#[ignore]
fn test() {
let version_meta = version_meta().unwrap();
for test in TESTS.iter() {
#[allow(clippy::nonminimal_bool)]
run_test(
module_path!(),
test,
// test.flags.contains(Flags::SKIP) ||
// smoelius: Temporarily disable all nightly third-party tests.
// See: https://github.com/tkaitchuck/aHash/issues/200
true // test.flags.contains(Flags::SKIP_NIGHTLY)
test.flags.contains(Flags::SKIP_NIGHTLY)
&& version_meta.channel == Channel::Nightly,
);
}
Expand Down Expand Up @@ -143,7 +135,7 @@ fn run_test(module_path: &str, test: &Test, no_run: bool) {
// However, rather than try to upgrade everything and then downgrade just `x25519-dalek`
// (similar to how I did for `libp2p-swarm-derive`), I am instead trying to upgrade just the
// packages that need it.
for package in ["libc", "num-bigint@0.4.0", "tempfile"] {
for package in ["ahash@0.7.6", "libc", "num-bigint@0.4.0", "tempfile"] {
#[allow(clippy::let_unit_value)]
let () = Command::new("cargo")
.current_dir(&subdir)
Expand Down
6 changes: 3 additions & 3 deletions cargo-test-fuzz/third_party.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"flags": [],
"flags": ["SKIP_NIGHTLY"],
"url": "https://github.com/CosmWasm/cw-plus",
"rev": "f40c2c07465e309a01d2d881e5c0346ac4825ca2",
"patch": "cw-plus.patch",
Expand All @@ -9,7 +9,7 @@
"targets": ["instantiate", "execute", "query", "migrate"]
},
{
"flags": ["EXPENSIVE"],
"flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
"url": "https://github.com/paritytech/polkadot-sdk",
"rev": "6185b002dfb54c73881257913a830416f2e17a15",
"patch": "substrate_client_transaction_pool.patch",
Expand All @@ -36,7 +36,7 @@
"targets": ["syscall_str_cmp_rust"]
},
{
"flags": ["EXPENSIVE"],
"flags": ["EXPENSIVE", "SKIP_NIGHTLY"],
"url": "https://github.com/solana-labs/solana",
"rev": "69345899f3b7449daac57ec1a28142bb410d7f06",
"patch": "solana.patch",
Expand Down
1 change: 0 additions & 1 deletion examples/tests/from.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#![allow(clippy::similar_names)]

use serde::{Deserialize, Serialize};
use std::convert::{TryFrom, TryInto};

#[derive(Clone, Deserialize, Serialize)]
struct Foo;
Expand Down
1 change: 0 additions & 1 deletion macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use proc_macro2::{Literal, Span, TokenStream as TokenStream2};
use quote::{quote, ToTokens};
use std::{
collections::{BTreeMap, BTreeSet},
convert::TryFrom,
env::var,
str::FromStr,
};
Expand Down