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 ++++++++------ crates/ra_hir/src/ty/tests.rs | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'crates/ra_hir') 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 + }), }, ); diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index 25dad81eb..b16b48258 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs @@ -62,7 +62,11 @@ impl S { "#, ); db.set_crate_graph_from_fixture(crate_graph! { - "main": ("/main.rs", ["foo"], CfgOptions::default().atom("test".into())), + "main": ("/main.rs", ["foo"], { + let mut opts = CfgOptions::default(); + opts.insert_atom("test".into()); + opts + }), "foo": ("/foo.rs", []), }); assert_eq!("(i32, {unknown}, i32, {unknown})", type_at_pos(&db, pos)); -- cgit v1.2.3