Skip to content
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.

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

Allow Float::ldexp to be called as a method #22631

Merged
merged 1 commit into from
Mar 20, 2015

Conversation

milibopp
Copy link
Contributor

Fixes #22098.

@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@frewsxcv
Copy link
Member

Needs a rebase

@bors
Copy link
Collaborator

bors commented Mar 8, 2015

☔ The latest upstream changes (presumably #22984) made this pull request unmergeable. Please resolve the merge conflicts.

@aturon
Copy link
Member

aturon commented Mar 10, 2015

@aepsil0n Sorry this PR totally fell through the cracks in my inbox! (Feel free to ping me or others on IRC if you're not hearing anything).

Anyway, this looks good to me after a rebase.

@milibopp
Copy link
Contributor Author

I wasn't around for the last days. Will rebase later.

@milibopp
Copy link
Contributor Author

@aturon rebase is done.

@aturon
Copy link
Member

aturon commented Mar 18, 2015

Thanks!

@bors: r+ 316f7e8 rollup

@Manishearth
Copy link
Member

This fails some tests on Linux, looks like you duplicated the unit tests:

/opt/rust/src/libstd/num/f32.rs:2369:5: 2378:6 error: duplicate definition of value `test_abs`
/opt/rust/src/libstd/num/f32.rs:2381:5: 2390:6 error: duplicate definition of value `test_abs_sub`
/opt/rust/src/libstd/num/f32.rs:2393:5: 2396:6 error: duplicate definition of value `test_abs_sub_nowin`
/opt/rust/src/libstd/num/f32.rs:2399:5: 2408:6 error: duplicate definition of value `test_signum`
/opt/rust/src/libstd/num/f32.rs:2411:5: 2420:6 error: duplicate definition of value `test_is_positive`
/opt/rust/src/libstd/num/f32.rs:2423:5: 2432:6 error: duplicate definition of value `test_is_negative`
/opt/rust/src/libstd/num/f32.rs:2435:5: 2449:6 error: duplicate definition of value `test_is_normal`
/opt/rust/src/libstd/num/f32.rs:2452:5: 2466:6 error: duplicate definition of value `test_classify`
/opt/rust/src/libstd/num/f32.rs:2469:5: 2486:6 error: duplicate definition of value `test_ldexp`
/opt/rust/src/libstd/num/f32.rs:2489:5: 2503:6 error: duplicate definition of value `test_frexp`
/opt/rust/src/libstd/num/f32.rs:2506:5: 2513:6 error: duplicate definition of value `test_frexp_nowin`
/opt/rust/src/libstd/num/f32.rs:2516:5: 2525:6 error: duplicate definition of value `test_integer_decode`
/opt/rust/src/libstd/num/f32.rs:2528:5: 2536:6 error: duplicate definition of value `test_sqrt_domain`

[removed from rollup]

@milibopp
Copy link
Contributor Author

oops… I wasn't careful enough doing the rebase.

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 316f7e8 with merge 32bed7a...

@milibopp
Copy link
Contributor Author

fixed.

@Manishearth
Copy link
Member

@bors: r=aturon

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

📌 Commit 5bfb5ba has been approved by aturon

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 20, 2015
@bors bors merged commit 5bfb5ba into rust-lang:master Mar 20, 2015
@milibopp milibopp deleted the issue-22098 branch March 20, 2015 12:03
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.

Float::ldexp should use the same format as everything else
6 participants