Skip to content

Commit 1bdedc7

Browse files
committed
Auto merge of #5572 - kngwyu:for-racer, r=alexcrichton
Make add_overrides and get_resolved_packages pub For racer-rust/racer#855. Now we're planning to use cargo to resolve dependencies, but for RLS we can't write `Cargo.lock`. So we have to call `resolve_with_previous` directly, and want to use these functions.
2 parents 9c78c3a + 101f2b0 commit 1bdedc7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/cargo/ops/resolve.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ pub fn resolve_with_previous<'a, 'cfg>(
335335

336336
/// Read the `paths` configuration variable to discover all path overrides that
337337
/// have been configured.
338-
fn add_overrides<'a>(registry: &mut PackageRegistry<'a>, ws: &Workspace<'a>) -> CargoResult<()> {
338+
pub fn add_overrides<'a>(registry: &mut PackageRegistry<'a>, ws: &Workspace<'a>) -> CargoResult<()> {
339339
let paths = match ws.config().get_list("paths")? {
340340
Some(list) => list,
341341
None => return Ok(()),
@@ -364,7 +364,7 @@ fn add_overrides<'a>(registry: &mut PackageRegistry<'a>, ws: &Workspace<'a>) ->
364364
Ok(())
365365
}
366366

367-
fn get_resolved_packages<'a>(resolve: &Resolve, registry: PackageRegistry<'a>) -> PackageSet<'a> {
367+
pub fn get_resolved_packages<'a>(resolve: &Resolve, registry: PackageRegistry<'a>) -> PackageSet<'a> {
368368
let ids: Vec<PackageId> = resolve.iter().cloned().collect();
369369
registry.get(&ids)
370370
}

0 commit comments

Comments
 (0)