Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cargo/core/resolver/conflict_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ enum ConflictStoreTrie {
impl ConflictStoreTrie {
/// Finds any known set of conflicts, if any,
/// 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.
fn find(
&self,
Expand Down Expand Up @@ -167,7 +167,7 @@ impl ConflictCache {
}
/// Finds any known set of conflicts, if any,
/// 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.
pub fn find_conflicting(
&self,
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/core/resolver/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ impl Context {
if let Some(link) = summary.links() {
if self.links.insert(link, id).is_some() {
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 \
is. Consider rebuilding the .lock file.",
&*link
Expand Down Expand Up @@ -395,7 +395,7 @@ impl PublicDependency {
// for each (transitive) parent that can newly see `t`
let mut stack = vec![(parent, is_public)];
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 o.0 != t {
// the (transitive) parent can already see a different version by `t`s name.
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/sources/registry/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl<'s> Iterator for UncanonicalizedIter<'s> {
.chars()
.scan(0u16, |s, c| {
// 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 {
let switch = (self.hyphen_combination_num & (1u16 << *s)) > 0;
let out = if (c == '_') ^ switch { '_' } else { '-' };
Expand Down