Skip to content

Conversation

@torokati44
Copy link
Member

Reverts #17810

Merge once the Vector.sort situation is sorted out.

@torokati44
Copy link
Member Author

Related: #17785 and rust-lang/rust#129561 (comment)

moulins added a commit to moulins/ruffle that referenced this pull request Sep 10, 2024
…fle-rs#17812

Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
moulins added a commit to moulins/ruffle that referenced this pull request Sep 10, 2024
…fle-rs#17812

Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
moulins added a commit to moulins/ruffle that referenced this pull request Sep 10, 2024
…fle-rs#17812

Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
moulins added a commit to moulins/ruffle that referenced this pull request Sep 10, 2024
…fle-rs#17812

Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
torokati44 pushed a commit to moulins/ruffle that referenced this pull request Sep 11, 2024
…fle-rs#17812

Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
torokati44 pushed a commit to moulins/ruffle that referenced this pull request Sep 11, 2024
…fle-rs#17812

Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
torokati44 pushed a commit that referenced this pull request Sep 11, 2024


Replace the use of Rust's standard sort in `Array.sort` and `sortOn` by
a port of avmplus' QuickSort algorithm. This avoid panics on Rust >=1.81
when `Array.sort` is called with a non-Ord comparison function, and will
always produce the same result as Flash Player.
@danielhjacobs danielhjacobs force-pushed the revert-17810-freeze-rust-version branch from d1503e8 to c6732ba Compare September 11, 2024 20:41
@danielhjacobs
Copy link
Contributor

Rebased. This is probably good to merge, but it should be tested to make sure #17785 works properly still.

@torokati44 torokati44 marked this pull request as ready for review September 11, 2024 20:48
@torokati44 torokati44 force-pushed the revert-17810-freeze-rust-version branch from c6732ba to 6e06adb Compare September 11, 2024 21:32
@torokati44
Copy link
Member Author

I actually can't reproduce that even before #17846... :/ On desktop at least.

@danielhjacobs
Copy link
Contributor

danielhjacobs commented Sep 11, 2024

Just to be sure, though I assume so, you're testing with building with rust 1.81, right?

@torokati44
Copy link
Member Author

Of course. The AVM trace is really helpful in suggesting that this is supposed to happen near the "end game screen", but for me, it didn't.

@torokati44 torokati44 force-pushed the revert-17810-freeze-rust-version branch from 6e06adb to 020ddca Compare September 12, 2024 20:30
@torokati44 torokati44 force-pushed the revert-17810-freeze-rust-version branch from 020ddca to c3ceeb6 Compare September 12, 2024 21:51
@torokati44 torokati44 enabled auto-merge (rebase) September 12, 2024 21:51
@torokati44 torokati44 merged commit e61fc25 into master Sep 12, 2024
@kjarosh kjarosh deleted the revert-17810-freeze-rust-version branch September 12, 2024 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants