From 355419d4044704d13a902641d86ad5501af8714d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Oct 2019 14:22:49 +0300 Subject: use slightly more idiomatic api for cfg --- crates/ra_hir/src/nameres/tests.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir/src/nameres') diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs index 34dd79574..208c2f16f 100644 --- a/crates/ra_hir/src/nameres/tests.rs +++ b/crates/ra_hir/src/nameres/tests.rs @@ -561,12 +561,14 @@ fn cfg_test() { "#, crate_graph! { "main": ("/main.rs", ["std"]), - "std": ("/lib.rs", [], CfgOptions::default() - .atom("test".into()) - .key_value("feature".into(), "foo".into()) - .key_value("feature".into(), "bar".into()) - .key_value("opt".into(), "42".into()) - ), + "std": ("/lib.rs", [], { + let mut opts = CfgOptions::default(); + opts.insert_atom("test".into()); + opts.insert_key_value("feature".into(), "foo".into()); + opts.insert_key_value("feature".into(), "bar".into()); + opts.insert_key_value("opt".into(), "42".into()); + opts + }), }, ); -- cgit v1.2.3 From 972079c0e32ba6085eb5ba02a137a6df86b79b5a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Oct 2019 14:39:44 +0300 Subject: macro DSL for cfg in tests --- crates/ra_hir/src/nameres/tests.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'crates/ra_hir/src/nameres') diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs index 208c2f16f..8c6b40aaf 100644 --- a/crates/ra_hir/src/nameres/tests.rs +++ b/crates/ra_hir/src/nameres/tests.rs @@ -7,7 +7,6 @@ mod mod_resolution; use std::sync::Arc; use insta::assert_snapshot; -use ra_cfg::CfgOptions; use ra_db::SourceDatabase; use test_utils::covers; @@ -561,13 +560,11 @@ fn cfg_test() { "#, crate_graph! { "main": ("/main.rs", ["std"]), - "std": ("/lib.rs", [], { - let mut opts = CfgOptions::default(); - opts.insert_atom("test".into()); - opts.insert_key_value("feature".into(), "foo".into()); - opts.insert_key_value("feature".into(), "bar".into()); - opts.insert_key_value("opt".into(), "42".into()); - opts + "std": ("/lib.rs", [], cfg = { + "test", + "feature" = "foo", + "feature" = "bar", + "opt" = "42", }), }, ); -- cgit v1.2.3