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

Remove skeptic #188

Merged
merged 2 commits into from Jan 13, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Expand Up @@ -15,9 +15,7 @@ jobs:
- 1.40.0
features:
- ""
- --features skeptic_tests
- --no-default-features
- --no-default-features --features skeptic_tests
- --features clippy

env:
Expand Down
3 changes: 0 additions & 3 deletions .travis.yml
@@ -1,6 +1,5 @@
sudo: false
language: rust
# cache: cargo # blocked by https://github.com/brson/rust-skeptic/issues/18
rust:
- beta
- stable
Expand All @@ -16,9 +15,7 @@ matrix:
env:
matrix:
- JOB=test CARGO_DEFAULT_FEATURES="" CARGO_FEATURES=""
- JOB=test CARGO_DEFAULT_FEATURES="" CARGO_FEATURES="skeptic_tests"
- JOB=test CARGO_DEFAULT_FEATURES="--no-default-features" CARGO_FEATURES=""
- JOB=test CARGO_DEFAULT_FEATURES="--no-default-features" CARGO_FEATURES="skeptic_tests"
- JOB=test CARGO_DEFAULT_FEATURES="" CARGO_FEATURES="clippy"
global:
- RUST_BACKTRACE=1
Expand Down
6 changes: 0 additions & 6 deletions derive_builder/Cargo.toml
Expand Up @@ -14,15 +14,13 @@ license = "MIT/Apache-2.0"
categories = ["development-tools", "rust-patterns"]
keywords = ["derive", "macro", "builder", "setter", "struct"]
readme = "README.md"
build = "build/mod.rs"

[badges]
travis-ci = { repository = "colin-kiegel/rust-derive-builder" }

[features]
default = ["std"]
std = []
skeptic_tests = ["skeptic", "derive_builder_macro/skeptic_tests", "derive_builder_core/skeptic_tests"]
clippy = ["derive_builder_macro/clippy", "derive_builder_core/clippy"]

[dependencies]
Expand All @@ -31,9 +29,5 @@ derive_builder_core = { version = "=0.10.0-alpha", path = "../derive_builder_cor

[dev-dependencies]
pretty_assertions = "0.6"
skeptic = "0.13"
rustversion = "1"
trybuild = "1"

[build-dependencies]
skeptic = { version = "0.13", optional = true }
5 changes: 0 additions & 5 deletions derive_builder/build/mod.rs

This file was deleted.

6 changes: 0 additions & 6 deletions derive_builder/build/skeptic.rs

This file was deleted.

13 changes: 0 additions & 13 deletions derive_builder/tests/skeptic.rs

This file was deleted.

6 changes: 0 additions & 6 deletions derive_builder_core/Cargo.toml
Expand Up @@ -13,11 +13,8 @@ documentation = "https://docs.rs/derive_builder_core"
license = "MIT/Apache-2.0"
readme = "README.md"

build = "build/mod.rs"

[features]
clippy = []
skeptic_tests = ["skeptic"]

[badges]
travis-ci = { repository = "colin-kiegel/rust-derive-builder" }
Expand All @@ -30,6 +27,3 @@ syn = { version = "1.0", features = ["full", "extra-traits"] }

[dev-dependencies]
pretty_assertions = "0.6"

[build-dependencies]
skeptic = { version = "0.13", optional = true }
5 changes: 0 additions & 5 deletions derive_builder_core/build/mod.rs

This file was deleted.

100 changes: 0 additions & 100 deletions derive_builder_core/build/skeptic.rs

This file was deleted.

3 changes: 0 additions & 3 deletions derive_builder_core/src/doc_tpl/mod.rs
Expand Up @@ -6,9 +6,6 @@
//! - {builder_name}
//! - {field_name}
//!
//! The `build.rs` script will generate documentation tests with the help
//! of `skeptic`.
//!
//! Templates are used like this:
//!
//! ```rust,ignore
Expand Down
1 change: 0 additions & 1 deletion derive_builder_macro/Cargo.toml
Expand Up @@ -23,7 +23,6 @@ proc-macro = true

[features]
clippy = ["derive_builder_core/clippy"]
skeptic_tests = ["derive_builder_core/skeptic_tests"]

[dependencies]
syn = { version = "1", features = ["full", "extra-traits"] }
Expand Down
2 changes: 1 addition & 1 deletion dev/checkfeatures.sh
Expand Up @@ -4,7 +4,7 @@ function main {
export CARGO_TARGET_DIR="../target/__checkfeatures"

commands=(
"cd derive_builder && rustup run 1.18.0 cargo test --all --color always --features \"skeptic_tests\""
"cd derive_builder && rustup run 1.18.0 cargo test --all --color always"
)

dev/travis-run-all.sh "${commands[@]}"
Expand Down
2 changes: 1 addition & 1 deletion dev/githook.sh
Expand Up @@ -64,7 +64,7 @@ function run_tests_on {
if [ "$rustup" == true ]; then
rustup update $1 || exit
fi
cd derive_builder && rustup run "$1" cargo test --all --color always --features skeptic_tests
cd derive_builder && rustup run "$1" cargo test --all --color always
); ret=$?
check_or_echo $ret "" "$result"
}
Expand Down
2 changes: 1 addition & 1 deletion dev/nightlytests.sh
Expand Up @@ -4,7 +4,7 @@ function main {
export CARGO_TARGET_DIR="../target/__nightlytests"

commands=(
"cd derive_builder && rustup run nightly cargo test --all --color always --features \"skeptic_tests nightlytests\""
"cd derive_builder && rustup run nightly cargo test --all --color always --features \"nightlytests\""
)

dev/travis-run-all.sh "${commands[@]}"
Expand Down