diff options
| author | mo8it <mo8it@proton.me> | 2024-02-29 17:01:32 +0100 |
|---|---|---|
| committer | mo8it <mo8it@proton.me> | 2024-02-29 17:01:32 +0100 |
| commit | 00a049b585554320d49e20d549530cf87df2fe02 (patch) | |
| tree | d10eef0c3af423e33131310ee9669396b3e5b3e9 | |
| parent | 9df73c6cb048fc28598ad0cbfb228444a4e9a553 (diff) | |
| download | rust-00a049b585554320d49e20d549530cf87df2fe02.tar.gz rust-00a049b585554320d49e20d549530cf87df2fe02.zip | |
Avoid cloning deps
| -rw-r--r-- | crates/test-fixture/src/lib.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crates/test-fixture/src/lib.rs b/crates/test-fixture/src/lib.rs index 68324cfeab8..58a0e48bc49 100644 --- a/crates/test-fixture/src/lib.rs +++ b/crates/test-fixture/src/lib.rs @@ -195,7 +195,10 @@ impl ChangeFixture { let prev = crates.insert(crate_name.clone(), crate_id); assert!(prev.is_none(), "multiple crates with same name: {}", crate_name); for dep in meta.deps { - let prelude = meta.extern_prelude.contains(&dep); + let prelude = match &meta.extern_prelude { + Some(v) => v.contains(&dep), + None => true, + }; let dep = CrateName::normalize_dashes(&dep); crate_deps.push((crate_name.clone(), dep, prelude)) } @@ -443,7 +446,7 @@ struct FileMeta { path: String, krate: Option<(String, CrateOrigin, Option<String>)>, deps: Vec<String>, - extern_prelude: Vec<String>, + extern_prelude: Option<Vec<String>>, cfg: CfgOptions, edition: Edition, env: Env, @@ -473,7 +476,7 @@ impl FileMeta { Self { path: f.path, krate: f.krate.map(|it| parse_crate(it, current_source_root_kind, f.library)), - extern_prelude: f.extern_prelude.unwrap_or_else(|| deps.clone()), + extern_prelude: f.extern_prelude, deps, cfg, edition: f.edition.map_or(Edition::CURRENT, |v| Edition::from_str(&v).unwrap()), |