Skip to content

Adds timsort and fix issue #3265 #3616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Oct 25, 2012
Merged

Adds timsort and fix issue #3265 #3616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cef7763
Add timsort to std/sort
14427 Sep 25, 2012
f98f00f
Fix timsort to use updated vec::reserve
14427 Sep 27, 2012
868d101
Put function argument last in sort function. Fixes #3265.
14427 Sep 28, 2012
f34c4f4
Remove trailing whitespace
14427 Sep 28, 2012
4f9f1c5
Switch order of merge_sort arguments in some benchmarks
14427 Sep 28, 2012
f7be2d9
Export timsort
14427 Sep 28, 2012
4d30d7f
Add a simple testsuite for timsort
14427 Sep 28, 2012
579c7e3
Make local variables and methods use underscores not camel case
14427 Oct 1, 2012
0ec5c9a
Add cleanup code so the the array remains in a valid state if a compa…
14427 Oct 3, 2012
44f8a44
Backup changes before pull from incoming
14427 Oct 4, 2012
efcd238
Merge remote-tracking branch 'original/incoming' into incoming
14427 Oct 4, 2012
455591d
Fix my merge
14427 Oct 4, 2012
7bd48b9
Get tim_sort working, add test for double-freeing elements in tmp
14427 Oct 4, 2012
74246d4
Finish up tests, uncomment when ICE is fixed.
14427 Oct 5, 2012
eee86d4
Remove debug info
14427 Oct 6, 2012
d4a5483
Add a test to check that badly written Ord impl do not cause double f…
14427 Oct 6, 2012
0e3bec0
Merge remote-tracking branch 'original/incoming' into incoming
14427 Oct 6, 2012
9aec7a3
Fix up tests, export tim_sort
14427 Oct 22, 2012
cc0f2c6
Merge remote-tracking branch 'original/incoming' into incoming
14427 Oct 22, 2012
71c311c
Uncomment tests and fix binarysort segmentation fault
14427 Oct 23, 2012
1380776
Use explicit self
14427 Oct 23, 2012
781e446
Fix long line
14427 Oct 23, 2012
254a86e
Fix typo
14427 Oct 23, 2012
e0a9d41
Re-add bad Ord impl test
14427 Oct 23, 2012
fb61f91
Add copy bound to sort
14427 Oct 25, 2012
19a59cb
Fix tests for Copy bound
14427 Oct 25, 2012
046460c
Remove some code that MergeState used to prevent double frees
14427 Oct 25, 2012
8e6d209
Remove and comment out more MergeState code
14427 Oct 25, 2012
98c8a40
Remove commented out code
14427 Oct 25, 2012
f2216ec
Move binarysort out of MergeState
14427 Oct 25, 2012
d4432a7
Remove some unused MergeState code, add a Fixme and remove a workarou…
14427 Oct 25, 2012
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
2 changes: 1 addition & 1 deletion src/cargo/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ fn print_pkg(s: @Source, p: &Package) {
fn print_source(s: @Source) {
info(s.name + ~" (" + s.url + ~")");

let pks = sort::merge_sort(sys::shape_lt, s.packages.get());
let pks = sort::merge_sort(s.packages.get(), sys::shape_lt);
let l = vec::len(pks);

print(io::with_str_writer(|writer| {
Expand Down
Loading