itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #8581 - toshokan:fix-error-typo, r=Eh2406

Browse Source 
Fix typo 'more then' -> 'more than' in error and comments

There were typos in a reported resolution error and in some comments
This commit is contained in:
bors 2020-08-03 16:10:33 +00:00
commit af539d2ad8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cargo/core/resolver/conflict_cache.rs
View File

@ -19,7 +19,7 @@ enum ConflictStoreTrie {
impl ConflictStoreTrie { impl ConflictStoreTrie {
/// Finds any known set of conflicts, if any, /// Finds any known set of conflicts, if any,
/// where all elements return some from `is_active` and contain `PackageId` specified. /// where all elements return some from `is_active` and contain `PackageId` specified.
/// If more then one are activated, then it will return /// If more than one are activated, then it will return
/// one that will allow for the most jump-back. /// one that will allow for the most jump-back.
fn find( fn find(
&self, &self,
@ -167,7 +167,7 @@ impl ConflictCache {
} }
/// Finds any known set of conflicts, if any, /// Finds any known set of conflicts, if any,
/// which are activated in `cx` and contain `PackageId` specified. /// which are activated in `cx` and contain `PackageId` specified.
/// If more then one are activated, then it will return /// If more than one are activated, then it will return
/// one that will allow for the most jump-back. /// one that will allow for the most jump-back.
pub fn find_conflicting( pub fn find_conflicting(
&self, &self,

4
src/cargo/core/resolver/context.rs
View File

@ -119,7 +119,7 @@ impl Context {
if let Some(link) = summary.links() { if let Some(link) = summary.links() {
if self.links.insert(link, id).is_some() { if self.links.insert(link, id).is_some() {
return Err(format_err!( return Err(format_err!(
"Attempting to resolve a dependency with more then \ "Attempting to resolve a dependency with more than \
one crate with links={}.\nThis will not build as \ one crate with links={}.\nThis will not build as \
is. Consider rebuilding the .lock file.", is. Consider rebuilding the .lock file.",
&*link &*link
@ -395,7 +395,7 @@ impl PublicDependency {
// for each (transitive) parent that can newly see `t` // for each (transitive) parent that can newly see `t`
let mut stack = vec![(parent, is_public)]; let mut stack = vec![(parent, is_public)];
while let Some((p, public)) = stack.pop() { while let Some((p, public)) = stack.pop() {
// TODO: don't look at the same thing more then once // TODO: don't look at the same thing more than once
if let Some(o) = self.inner.get(&p).and_then(|x| x.get(&t.name())) { if let Some(o) = self.inner.get(&p).and_then(|x| x.get(&t.name())) {
if o.0 != t { if o.0 != t {
// the (transitive) parent can already see a different version by `t`s name. // the (transitive) parent can already see a different version by `t`s name.

2
src/cargo/sources/registry/index.rs
View File

@ -116,7 +116,7 @@ impl<'s> Iterator for UncanonicalizedIter<'s> {
.chars() .chars()
.scan(0u16, |s, c| { .scan(0u16, |s, c| {
// the check against 15 here's to prevent // the check against 15 here's to prevent
// shift overflow on inputs with more then 15 hyphens // shift overflow on inputs with more than 15 hyphens
if (c == '_' || c == '-') && *s <= 15 { if (c == '_' || c == '-') && *s <= 15 {
let switch = (self.hyphen_combination_num & (1u16 << *s)) > 0; let switch = (self.hyphen_combination_num & (1u16 << *s)) > 0;
let out = if (c == '_') ^ switch { '_' } else { '-' }; let out = if (c == '_') ^ switch { '_' } else { '-' };