File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ enum ConflictStoreTrie {
1919impl ConflictStoreTrie {
2020 /// Finds any known set of conflicts, if any,
2121 /// where all elements return some from `is_active` and contain `PackageId` specified.
22- /// If more then one are activated, then it will return
22+ /// If more than one are activated, then it will return
2323 /// one that will allow for the most jump-back.
2424 fn find (
2525 & self ,
@@ -167,7 +167,7 @@ impl ConflictCache {
167167 }
168168 /// Finds any known set of conflicts, if any,
169169 /// which are activated in `cx` and contain `PackageId` specified.
170- /// If more then one are activated, then it will return
170+ /// If more than one are activated, then it will return
171171 /// one that will allow for the most jump-back.
172172 pub fn find_conflicting (
173173 & self ,
Original file line number Diff line number Diff line change @@ -119,7 +119,7 @@ impl Context {
119119 if let Some ( link) = summary. links ( ) {
120120 if self . links . insert ( link, id) . is_some ( ) {
121121 return Err ( format_err ! (
122- "Attempting to resolve a dependency with more then \
122+ "Attempting to resolve a dependency with more than \
123123 one crate with links={}.\n This will not build as \
124124 is. Consider rebuilding the .lock file.",
125125 & * link
@@ -395,7 +395,7 @@ impl PublicDependency {
395395 // for each (transitive) parent that can newly see `t`
396396 let mut stack = vec ! [ ( parent, is_public) ] ;
397397 while let Some ( ( p, public) ) = stack. pop ( ) {
398- // TODO: don't look at the same thing more then once
398+ // TODO: don't look at the same thing more than once
399399 if let Some ( o) = self . inner . get ( & p) . and_then ( |x| x. get ( & t. name ( ) ) ) {
400400 if o. 0 != t {
401401 // the (transitive) parent can already see a different version by `t`s name.
Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ impl<'s> Iterator for UncanonicalizedIter<'s> {
116116 . chars ( )
117117 . scan ( 0u16 , |s, c| {
118118 // the check against 15 here's to prevent
119- // shift overflow on inputs with more then 15 hyphens
119+ // shift overflow on inputs with more than 15 hyphens
120120 if ( c == '_' || c == '-' ) && * s <= 15 {
121121 let switch = ( self . hyphen_combination_num & ( 1u16 << * s) ) > 0 ;
122122 let out = if ( c == '_' ) ^ switch { '_' } else { '-' } ;
You can’t perform that action at this time.
0 commit comments