mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-31 13:40:15 +03:00
9aad2d551e
Fixes rebase fallout, makes code correct in presence of 128-bit constants. This commit includes manual merge conflict resolution changes from a rebase by @est31.