one more comment

diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs
index cea11a2667eca09f4e5f28e72e874b8e403eaff8..8ae41851287c044f7eaa00a270068528538daee5 100644 (file)
--- a/src/cargo/core/resolver/context.rs
+++ b/src/cargo/core/resolver/context.rs
@@ -56,10 +56,12 @@ pub struct Context {
 /// When backtracking it can be useful to know how far back to go.
 /// The `ContextAge` of a `Context` is a monotonically increasing counter of the number
 /// of decisions made to get to this state.
-/// Several structures store the `ContextAge` when it was added, this lets use jump back.
+/// Several structures store the `ContextAge` when it was added, that gets use in jump back.
 pub type ContextAge = usize;
 
-/// find the activated version of a crate based on the name, source, and semver compatibility
+/// Find the activated version of a crate based on the name, source, and semver compatibility.
+/// By storing this in a hash map we ensure that there is only one
+/// semver compatible version of each crate.
 /// This all so stores the `ContextAge`.
 pub type Activations =
     im_rc::HashMap<(InternedString, SourceId, SemverCompatibility), (Summary, ContextAge)>;
@@ -208,7 +210,7 @@ impl Context {
 
     /// Checks whether all of `parent` and the keys of `conflicting activations`
     /// are still active.
-    /// If so returns the "age" (len of activations) when the newest one was added.
+    /// If so returns the `ContextAge` when the newest one was added.
     pub fn is_conflicting(
         &self,
         parent: Option<PackageId>,

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index aa7b4d903a5c3916b4edc21061cc672ccd5867bc..5a4517bb0bd9994d865b7404e809ce34b83593ec 100644 (file)
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -870,7 +870,7 @@ fn generalize_conflicting(
     if conflicting_activations.is_empty() {
         return None;
     }
-    // We need to determine the "age" that this `conflicting_activations` will jump to, and why.
+    // We need to determine the `ContextAge` that this `conflicting_activations` will jump to, and why.
     let (jumpback_critical_age, jumpback_critical_id) = conflicting_activations
         .keys()
         .map(|&c| (cx.is_active(c).expect("not currently active!?"), c))