Skip to content

Commit

Permalink
Warn about path overrides that won't work
Browse files Browse the repository at this point in the history
Cargo has a long-standing [bug] in path overrides where they will cause spurious
rebuilds of crates in the crate graph. This can be very difficult to diagnose
and be incredibly frustrating as well. Unfortunately, though, it's behavior that
fundamentally can't be fixed in Cargo.

The crux of the problem happens when a `path` replacement changes something
about the list of dependencies of the crate that it's replacing. This alteration
to the list of dependencies *cannot be tracked by Cargo* as the lock file was
previously emitted. In the best case this ends up causing random recompiles. In
the worst case it cause infinite registry updates that always result in
recompiles.

A solution to this intention, changing the dependency graph of an overridden
dependency, was [implemented] with the `[replace]` feature in Cargo awhile back.
With that in mind, this commit implements a *warning* whenever a bad dependency
replacement is detected. The message here is pretty wordy, but it's intended to
convey that you should switch to using `[replace]` for a more robust
impelmentation, and it can also give security to anyone using `path` overrides
that if they get past this warning everything should work as intended.

[bug]: #2041
[implemented]: http://doc.crates.io/specifying-dependencies.html#overriding-dependencies

Closes #2041
  • Loading branch information
alexcrichton committed Sep 29, 2016
1 parent 9442cc3 commit fc0e642
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 22 deletions.
107 changes: 85 additions & 22 deletions src/cargo/core/registry.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::{HashSet, HashMap};
use std::collections::HashMap;

use core::{Source, SourceId, SourceMap, Summary, Dependency, PackageId, Package};
use core::PackageSet;
Expand Down Expand Up @@ -188,17 +188,16 @@ impl<'cfg> PackageRegistry<'cfg> {
}

fn query_overrides(&mut self, dep: &Dependency)
-> CargoResult<Vec<Summary>> {
let mut seen = HashSet::new();
let mut ret = Vec::new();
-> CargoResult<Option<Summary>> {
for s in self.overrides.iter() {
let src = self.sources.get_mut(s).unwrap();
let dep = Dependency::new_override(dep.name(), s);
ret.extend(try!(src.query(&dep)).into_iter().filter(|s| {
seen.insert(s.name().to_string())
}));
let mut results = try!(src.query(&dep));
if results.len() > 0 {
return Ok(Some(results.remove(0)))
}
}
Ok(ret)
Ok(None)
}

// This function is used to transform a summary to another locked summary if
Expand Down Expand Up @@ -277,25 +276,89 @@ impl<'cfg> PackageRegistry<'cfg> {
}
})
}

fn warn_bad_override(&self,
override_summary: &Summary,
real_summary: &Summary) -> CargoResult<()> {
let real = real_summary.package_id();
let map = try!(self.locked.get(real.source_id()).chain_error(|| {
human(format!("failed to find lock source of {}", real))
}));
let list = try!(map.get(real.name()).chain_error(|| {
human(format!("failed to find lock name of {}", real))
}));
let &(_, ref real_deps) = try!(list.iter().find(|&&(ref id, _)| {
real == id
}).chain_error(|| {
human(format!("failed to find lock version of {}", real))
}));
let mut real_deps = real_deps.clone();

let boilerplate = "\
This is currently allowed but is known to produce buggy behavior with spurious
recompiles and changes to the crate graph. Path overrides unfortunately were
never intended to support this feature, so for now this message is just a
warning. In the future, however, this message will become a hard error.
To change the dependency graph via an override it's recommended to use the
`[replace]` feature of Cargo instead of the path override feature. This is
documented online at the url below for more information.
http://doc.crates.io/specifying-dependencies.html#overriding-dependencies
";

for dep in override_summary.dependencies() {
if let Some(i) = real_deps.iter().position(|id| dep.matches_id(id)) {
real_deps.remove(i);
continue
}
let msg = format!("\
path override for crate `{}` has altered the original list of\n\
dependencies; the dependency on `{}` was either added or\n\
modified to not match the previously resolved version\n\n\
{}", override_summary.package_id().name(), dep.name(), boilerplate);
try!(self.source_config.config().shell().warn(&msg));
return Ok(())
}

for id in real_deps {
let msg = format!("\
path override for crate `{}` has altered the original list of
dependencies; the dependency on `{}` was removed\n\n
{}", override_summary.package_id().name(), id.name(), boilerplate);
try!(self.source_config.config().shell().warn(&msg));
return Ok(())
}

Ok(())
}
}

impl<'cfg> Registry for PackageRegistry<'cfg> {
fn query(&mut self, dep: &Dependency) -> CargoResult<Vec<Summary>> {
let overrides = try!(self.query_overrides(&dep));

let ret = if overrides.is_empty() {
// Ensure the requested source_id is loaded
try!(self.ensure_loaded(dep.source_id(), Kind::Normal).chain_error(|| {
human(format!("failed to load source for a dependency \
on `{}`", dep.name()))
}));

match self.sources.get_mut(dep.source_id()) {
Some(src) => try!(src.query(&dep)),
None => Vec::new(),
// Ensure the requested source_id is loaded
try!(self.ensure_loaded(dep.source_id(), Kind::Normal).chain_error(|| {
human(format!("failed to load source for a dependency \
on `{}`", dep.name()))
}));

let override_summary = try!(self.query_overrides(&dep));
let real_summaries = match self.sources.get_mut(dep.source_id()) {
Some(src) => Some(try!(src.query(&dep))),
None => None,
};

let ret = match (override_summary, real_summaries) {
(Some(candidate), Some(summaries)) => {
if summaries.len() != 1 {
bail!("found an override with a non-locked list");
}
try!(self.warn_bad_override(&candidate, &summaries[0]));
vec![candidate]
}
} else {
overrides
(Some(_), None) => bail!("override found but no real ones"),
(None, Some(summaries)) => summaries,
(None, None) => Vec::new(),
};

// post-process all returned summaries to ensure that we lock all
Expand Down
4 changes: 4 additions & 0 deletions src/cargo/sources/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ impl<'cfg> SourceConfigMap<'cfg> {
Ok(base)
}

pub fn config(&self) -> &'cfg Config {
self.config
}

pub fn load(&self, id: &SourceId) -> CargoResult<Box<Source + 'cfg>> {
debug!("loading: {}", id);
let mut name = match self.id2name.get(id) {
Expand Down
67 changes: 67 additions & 0 deletions tests/overrides.rs
Original file line number Diff line number Diff line change
Expand Up @@ -682,3 +682,70 @@ fn no_override_self() {
assert_that(p.cargo_process("build").arg("--verbose"),
execs().with_status(0));
}

#[test]
fn broken_path_override_warns() {
Package::new("foo", "0.1.0").publish();
Package::new("foo", "0.2.0").publish();

let p = project("local")
.file("Cargo.toml", r#"
[package]
name = "local"
version = "0.0.1"
authors = []
[dependencies]
a = { path = "a1" }
"#)
.file("src/lib.rs", "")
.file("a1/Cargo.toml", r#"
[package]
name = "a"
version = "0.0.1"
authors = []
[dependencies]
foo = "0.1"
"#)
.file("a1/src/lib.rs", "")
.file("a2/Cargo.toml", r#"
[package]
name = "a"
version = "0.0.1"
authors = []
[dependencies]
foo = "0.2"
"#)
.file("a2/src/lib.rs", "")
.file(".cargo/config", r#"
paths = ["a2"]
"#);

assert_that(p.cargo_process("build"),
execs().with_status(0)
.with_stderr("\
[UPDATING] [..]
warning: path override for crate `a` has altered the original list of
dependencies; the dependency on `foo` was either added or
modified to not match the previously resolved version
This is currently allowed but is known to produce buggy behavior with spurious
recompiles and changes to the crate graph. Path overrides unfortunately were
never intended to support this feature, so for now this message is just a
warning. In the future, however, this message will become a hard error.
To change the dependency graph via an override it's recommended to use the
`[replace]` feature of Cargo instead of the path override feature. This is
documented online at the url below for more information.
http://doc.crates.io/specifying-dependencies.html#overriding-dependencies
[DOWNLOADING] [..]
[COMPILING] [..]
[COMPILING] [..]
[COMPILING] [..]
[FINISHED] [..]
"));
}

8 comments on commit fc0e642

@sgrif
Copy link
Contributor

@sgrif sgrif commented on fc0e642 Oct 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there an equivalent to [replace] that can be used in .cargo/config? The whole reason for using path = is to avoid having to specify the replacement in 20 different places, is it not?

@alexcrichton
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sgrif not currently, no, unfortunately. If there's a workflow to be had here though (one that works), then we can work on developing it though!

(note that it may also be the case that this warning is being emitted in error)

@sgrif
Copy link
Contributor

@sgrif sgrif commented on fc0e642 Oct 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diesel-rs/diesel@78080f0 has the change we had to make. Basically we just want to make sure that all of our test suites run against the in-tree version of everything. Using [replace] means we have to juggle it in about a dozen manifest files overall

@alexcrichton
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that's actually more correct! The .cargo folder is never intended to be checked into a repo

@alexcrichton
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Er, actually, how come path dependencies aren't used there? It's the intention that many crates in one repo all have path dependencies to one another.

@sgrif
Copy link
Contributor

@sgrif sgrif commented on fc0e642 Oct 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because after the 20th time a bug slipped in because I forgot to point to point something at a path dependency, it felt like a repo-wide override made much more sense. The alternative is just a lot of git churn and room for mistakes.

@alexcrichton
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If everything is a path dependency always though, would there still be things forgotten?

@sgrif
Copy link
Contributor

@sgrif sgrif commented on fc0e642 Oct 10, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.