Merge branch 'master' into remove-logging

derive_builder/Cargo.toml

@@ -31,8 +31,9 @@ derive_builder_core = { version = "=0.10.0-alpha", path = "../derive_builder_cor
 
 [dev-dependencies]
 pretty_assertions = "0.6"
-compiletest_rs = "0.5"
 skeptic = "0.13"
+rustversion = "1"
+trybuild = "1"
 
 [build-dependencies]
 skeptic = { version = "0.13", optional = true }

derive_builder/tests/compile-fail/deny_empty_default.rs

@@ -6,7 +6,6 @@ extern crate derive_builder;
 #[derive(Builder)]
 struct Lorem {
     #[builder(default = "")]
-    //~^ ERROR Unknown literal value ``
     ipsum: String,
 }
 

derive_builder/tests/compile-fail/deny_empty_default.stderr

@@ -0,0 +1,5 @@
+error: Unknown literal value ``
+ --> $DIR/deny_empty_default.rs:8:25
+  |
+8 |     #[builder(default = "")]
+  |                         ^^

derive_builder/tests/compile-fail/private_build_fn.rs

@@ -25,7 +25,6 @@ fn main() {
     let lorem1 = LoremBuilder::default().my_build();
 
     let lorem2 = LoremBuilder::default().build().unwrap();
-    //~^ ERROR `build` is private
 
     println!("{:?} vs {:?}", lorem1, lorem2);
-}
+}

derive_builder/tests/compile-fail/private_build_fn.stderr

@@ -0,0 +1,13 @@
+warning: unused import: `Lorem`
+  --> $DIR/private_build_fn.rs:23:21
+   |
+23 |     use container::{Lorem, LoremBuilder};
+   |                     ^^^^^
+   |
+   = note: `#[warn(unused_imports)]` on by default
+
+error[E0624]: method `build` is private
+  --> $DIR/private_build_fn.rs:27:42
+   |
+27 |     let lorem2 = LoremBuilder::default().build().unwrap();
+   |                                          ^^^^^

derive_builder/tests/compile-fail/private_builder.rs

@@ -15,10 +15,8 @@ pub mod foo {
 
 fn main() {
     let x = foo::LoremBuilder::default()
-    //~^ ERROR struct `LoremBuilder` is private
         .public("Hello")
         .build()
-    //~^ ERROR `build` is private
         .unwrap();
 
     assert_eq!(x.public, "Hello".to_string());

derive_builder/tests/compile-fail/private_builder.stderr

@@ -0,0 +1,11 @@
+error[E0603]: struct `LoremBuilder` is private
+  --> $DIR/private_builder.rs:17:18
+   |
+17 |     let x = foo::LoremBuilder::default()
+   |                  ^^^^^^^^^^^^
+
+error[E0624]: method `build` is private
+  --> $DIR/private_builder.rs:19:10
+   |
+19 |         .build()
+   |          ^^^^^

derive_builder/tests/compile-fail/private_fields.rs

@@ -23,5 +23,4 @@ fn main() {
     lorem.dolor(15u16);
     lorem.sit = Some(true); // <-- public
     lorem.dolor = Some(0); // <-- private
-    //~^ ERROR field `dolor` of struct `inner::LoremBuilder` is private
-}
+}

derive_builder/tests/compile-fail/private_fields.stderr

@@ -0,0 +1,5 @@
+error[E0616]: field `dolor` of struct `inner::LoremBuilder` is private
+  --> $DIR/private_fields.rs:25:5
+   |
+25 |     lorem.dolor = Some(0); // <-- private
+   |     ^^^^^^^^^^^

derive_builder/tests/compile-fail/rename_setter_struct_level.rs

@@ -5,15 +5,13 @@ extern crate derive_builder;
 
 #[derive(Debug, PartialEq, Default, Builder, Clone)]
 #[builder(setter(name = "foo"))]
-//~^ ERROR Unknown field: `name`
 struct Lorem {
     ipsum: &'static str,
     pub dolor: &'static str,
 }
 
 fn main() {
     let x = LoremBuilder::default()
-    //~^ ERROR use of undeclared type or module `LoremBuilder`
         .ipsum("ipsum")
         .foo("dolor")
         .build()

derive_builder/tests/compile-fail/rename_setter_struct_level.stderr

@@ -0,0 +1,11 @@
+error: Unknown field: `name`
+ --> $DIR/rename_setter_struct_level.rs:7:18
+  |
+7 | #[builder(setter(name = "foo"))]
+  |                  ^^^^
+
+error[E0433]: failed to resolve: use of undeclared type or module `LoremBuilder`
+  --> $DIR/rename_setter_struct_level.rs:14:13
+   |
+14 |     let x = LoremBuilder::default()
+   |             ^^^^^^^^^^^^ use of undeclared type or module `LoremBuilder`

derive_builder/tests/compiletests.rs

@@ -1,30 +1,10 @@
-extern crate compiletest_rs as compiletest;
-
-use std::env;
-use std::path::PathBuf;
-
-fn run_mode(mode: &'static str) {
-    let base_dir = env!("CARGO_MANIFEST_DIR");
-
-    let test_dir = PathBuf::from(format!("{}/tests/{}", base_dir, mode));
-
-    if !test_dir.is_dir() {
-        panic!("Directory does not exist: {:?}", test_dir);
-    }
-
-    let mut config = compiletest::Config::default();
-    let cfg_mode = mode.parse().ok().expect("Invalid mode");
-
-    config.mode = cfg_mode;
-    config.src_base = test_dir;
-    config.link_deps();
-    config.clean_rmeta();
-
-    compiletest::run_tests(&config);
-}
+extern crate rustversion;
+extern crate trybuild;
 
+#[rustversion::stable(1.40)]
 #[test]
 fn compile_test() {
-    run_mode("run-pass");
-    run_mode("compile-fail");
+    let t = trybuild::TestCases::new();
+    t.pass("tests/run-pass/*.rs");
+    t.compile_fail("tests/compile-fail/*.rs");
 }

derive_builder_core/build/skeptic.rs

@@ -46,9 +46,12 @@ use std::io::Write;
 const DOC_TPL_DIR: &'static str = "src/doc_tpl/";
 const DOC_TPL_OUT_DIR: &'static str = "doc_tpl/";
 
-fn generate_doc_tpl_tests() -> Result<Vec<String>, Box<Error>> {
-    let tpl_dir = Path::new(&env::var("CARGO_MANIFEST_DIR")?).join(DOC_TPL_DIR);
-    let out_dir = Path::new(&env::var("OUT_DIR")?).join(DOC_TPL_OUT_DIR);
+fn generate_doc_tpl_tests() -> Result<Vec<String>, Box<dyn Error>> {
+    let root_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
+    let mut tpl_dir = root_dir;
+    tpl_dir.push(DOC_TPL_DIR);
+    let mut out_dir = PathBuf::from(env::var("OUT_DIR")?);
+    out_dir.push(DOC_TPL_OUT_DIR);
 
     if !out_dir.is_dir() {
         DirBuilder::new().create(&out_dir)?;