Auto merge of #9720 - In-line:weather-is-not-nice-today, r=ehuss

Weather is not nice today..
rust-lang · Jul 23, 2021 · 37d9fdb · 37d9fdb
2 parents 121f4b3 + 8ee76f6
commit 37d9fdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/crates/resolver-tests/tests/resolve.rs b/crates/resolver-tests/tests/resolve.rs
@@ -93,7 +93,7 @@ proptest! {
             prop_assert_eq!(
                 res.is_ok(),
                 mres.is_ok(),
-                "minimal-versions and regular resolver disagree about weather `{} = \"={}\"` can resolve",
+                "minimal-versions and regular resolver disagree about whether `{} = \"={}\"` can resolve",
                 this.name(),
                 this.version()
             )

diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs
@@ -27,7 +27,7 @@ pub struct Context {
     /// get the package that will be linking to a native library by its links attribute
     pub links: im_rc::HashMap<InternedString, PackageId>,
     /// for each package the list of names it can see,
-    /// then for each name the exact version that name represents and weather the name is public.
+    /// then for each name the exact version that name represents and whether the name is public.
     pub public_dependency: Option<PublicDependency>,
 
     /// a way to look up for a package in activations what packages required it