Skip to content

Commit

Permalink
docs(contrib): Move some lower resolver details from ops to core
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed Mar 17, 2023
1 parent ef55037 commit bd5e1a5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
11 changes: 11 additions & 0 deletions src/cargo/core/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@
//! everything to bail out immediately and return success, and only if *nothing*
//! works do we actually return an error up the stack.
//!
//! Resolution is currently performed twice
//! 1. With all features enabled (this is what gets saved to `Cargo.lock`)
//! 2. With only the specific features the user selected on the command-line. Ideally this
//! run will get removed in the future when transitioning to the new feature resolver.
//!
//! A new feature-specific resolver was added in 2020 which adds more sophisticated feature
//! resolution. It is located in the [`features`] module. The original dependency resolver still
//! performs feature unification, as it can help reduce the dependencies it has to consider during
//! resolution (rather than assuming every optional dependency of every package is enabled).
//! Checking if a feature is enabled must go through the new feature resolver.
//!
//! ## Performance
//!
//! Note that this is a relatively performance-critical portion of Cargo. The
Expand Down
12 changes: 0 additions & 12 deletions src/cargo/ops/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@
//! - [`resolve_with_previous`]: A low-level function for running the resolver,
//! providing the most power and flexibility.
//!
//! Resolution is currently performed twice
//! 1. With all features enabled (this is what gets saved to `Cargo.lock`)
//! 2. With only the specific features the user selected on the command-line. Ideally this
//! run will get removed in the future when transitioning to the new feature resolver.
//!
//! A new feature-specific resolver was added in 2020 which adds more sophisticated feature
//! resolution. It is located in the [`crate::core::resolver::features`] module. The original
//! dependency resolver still performs feature unification, as it can help reduce the dependencies
//! it has to consider during resolution (rather than assuming every optional dependency of every
//! package is enabled). Checking if a feature is enabled must go through the new feature
//! resolver.
//!
//! ### Data Structures
//!
//! - [`Workspace`]:
Expand Down

0 comments on commit bd5e1a5

Please sign in to comment.