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.

Sign up for GitHub

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

Support [patch] in .cargo/config files #9204

Merged
merged 7 commits into from
Mar 15, 2021
Merged

Support [patch] in .cargo/config files #9204

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8178f22
Support [patch] in .cargo/config files
Feb 24, 2021
140a770
Only apply config patches on resolve
Feb 26, 2021
ce0b8e8
Merge remote-tracking branch 'upstream/master' into patch-in-config
Mar 3, 2021
2c88a63
Remove Cow over-optimization
Mar 4, 2021
6995e1d
Extract config patch on use
Mar 8, 2021
6bc97fc
Merge branch 'master' into patch-in-config
Mar 8, 2021
b50cde8
Fixes from review
Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixes from review
  • Loading branch information
Jon Gjengset committed Mar 15, 2021
commit b50cde88b458774f0f1f8211ef450ff7872f3894
6 changes: 2 additions & 4 deletions src/cargo/core/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,9 @@ impl<'cfg> Workspace<'cfg> {
/* platform */ None,
// NOTE: Since we use ConfigRelativePath, this root isn't used as
// any relative paths are resolved before they'd be joined with root.
self.root(),
&Path::new("unused-relative-path"),
self.unstable_features(),
None,
/* kind */ None,
)
})
.collect::<CargoResult<Vec<_>>>()?,
Expand All @@ -418,8 +418,6 @@ impl<'cfg> Workspace<'cfg> {
.warn(format!("[patch] in cargo config: {}", message))?
}

let _ = nested_paths;

Ok(patch)
}

Expand Down