Commit d59bb3a

committed

Add merge fn for merge sort.rs; Move eslint to dev dep

1 parent ca74189 commit d59bb3aCopy full SHA for d59bb3a

File tree

+280

-78

lines changed

+280

-78

lines changed

Lines changed: 7 additions & 0 deletions

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ pub fn fibonacci(n: usize) -> usize {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`pub fn reverse(s: &str) -> String {`
`42`		`- if s.len() == 0 {`
	`42`	`+ if s.is_empty() {`
`43`	`43`	`return s.to_owned();`
`44`	`44`	`}`
`45`		`- let char = match s.chars().nth(0) {`
	`45`	`+ let char = match s.chars().next() {`
`46`	`46`	`Some(c) => c.to_string(),`
`47`	`47`	`None => "".to_string(),`
`48`	`48`	`};`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ pub fn linear_search(nums: &[isize], target: isize) -> isize {`
`12`	`12`	`pub fn binary_search_nums(nums: &[isize], target: isize) -> isize {`
`13`	`13`	`/* takes a sorted collection of nums and a target number to search for;`
`14`	`14`	`returns the index or -1 if not found */`
`15`		`- if nums.len() == 0 {`
	`15`	`+ if nums.is_empty() {`
`16`	`16`	`return -1;`
`17`	`17`	`}`
`18`	`18`	`let mut left = 0;`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,30 @@ pub fn insertion_sort(nums: &mut [isize]) -> &mut [isize] {`
`42`	`42`	`}`
`43`	`43`	`nums`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+pub fn merge(first_arr: &[isize], second_arr: &[isize]) -> Vec<isize> {`
	`47`	`+ /* merges two similarly sorted arrays */`
	`48`	`+ let mut merged = Vec::with_capacity(first_arr.len() + second_arr.len());`
	`49`	`+ let mut i = 0;`
	`50`	`+ let mut j = 0;`
	`51`	`+ while i < first_arr.len() && j < second_arr.len() {`
	`52`	`+ if first_arr[i] <= second_arr[j] {`
	`53`	`+ merged.push(first_arr[i]);`
	`54`	`+ i += 1;`
	`55`	`+ } else if first_arr[i] > second_arr[j] {`
	`56`	`+ merged.push(second_arr[j]);`
	`57`	`+ j += 1;`
	`58`	`+ }`
	`59`	`+ }`
	`60`	`+ // push remaining values in unexhausted array into merged`
	`61`	`+ if i < first_arr.len() {`
	`62`	`+ for num in first_arr.iter().skip(i) {`
	`63`	`+ merged.push(*num);`
	`64`	`+ }`
	`65`	`+ } else if j < second_arr.len() {`
	`66`	`+ for num in second_arr.iter().skip(j) {`
	`67`	`+ merged.push(*num);`
	`68`	`+ }`
	`69`	`+ }`
	`70`	`+ merged`
	`71`	`+}`

Comments

(0)