Skip to content

Conversation

chansuke
Copy link
Contributor

This is a partial fix of #76268.

r? @matklad

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2020
@jyn514 jyn514 added A-testsuite Area: The testsuite used to check the correctness of rustc T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Oct 27, 2020
@m-ou-se
Copy link
Member

m-ou-se commented Nov 4, 2020

The automated code formatting check is failing because of the 2-space indentation. Can you apply the formatting suggested by rustfmt (4-space indentation)? ./x.py fmt will do that for you.

Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with the whitespace fixed

Comment on lines 3 to 7
use core::f64;
let x = "NaN".to_string();
assert_eq!(format!("{}", f64::NAN), x);
assert_eq!(format!("{:e}", f64::NAN), x);
assert_eq!(format!("{:E}", f64::NAN), x);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
use core::f64;
let x = "NaN".to_string();
assert_eq!(format!("{}", f64::NAN), x);
assert_eq!(format!("{:e}", f64::NAN), x);
assert_eq!(format!("{:E}", f64::NAN), x);
use core::f64;
let x = "NaN".to_string();
assert_eq!(format!("{}", f64::NAN), x);
assert_eq!(format!("{:e}", f64::NAN), x);
assert_eq!(format!("{:E}", f64::NAN), x);

@jyn514 jyn514 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 4, 2020
@jyn514 jyn514 assigned jyn514 and unassigned matklad Nov 4, 2020
@chansuke
Copy link
Contributor Author

chansuke commented Nov 5, 2020

r? @jyn514

@jyn514
Copy link
Member

jyn514 commented Nov 5, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 5, 2020

📌 Commit 97d5a1b has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 5, 2020
@jyn514
Copy link
Member

jyn514 commented Nov 5, 2020

Thanks for the PR!

@ollie27
Copy link
Member

ollie27 commented Nov 5, 2020

Will this test actually be run? Doesn't it need mod nan; adding to library\core\tests\num\mod.rs?

@jyn514
Copy link
Member

jyn514 commented Nov 5, 2020

Oops, good catch!

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 5, 2020
@jyn514
Copy link
Member

jyn514 commented Nov 5, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 5, 2020

📌 Commit f9b139f has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 5, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 5, 2020
Move f64::NAN ui tests into `library`

This is a partial fix of rust-lang#76268.

r? `@matklad`
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 5, 2020
Move f64::NAN ui tests into `library`

This is a partial fix of rust-lang#76268.

r? ``@matklad``
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 5, 2020
Rollup of 15 pull requests

Successful merges:

 - rust-lang#76718 (Move Vec UI tests to unit tests when possible)
 - rust-lang#78093 (Clean up docs for 'as' keyword)
 - rust-lang#78425 (Move f64::NAN ui tests into `library`)
 - rust-lang#78465 (Change as_str → to_string in proc_macro::Ident::span() docs)
 - rust-lang#78584 (Add keyboard handling to the theme picker menu)
 - rust-lang#78716 (Array trait impl comment/doc fixes)
 - rust-lang#78727 ((rustdoc) fix test for trait impl display)
 - rust-lang#78733 (fix a couple of clippy warnings:)
 - rust-lang#78735 (Simplify the implementation of `get_mut` (no unsafe))
 - rust-lang#78738 (Move range in ui test to ops test in library/core)
 - rust-lang#78739 (Fix ICE on type error in async function)
 - rust-lang#78742 (make intern_const_alloc_recursive return error)
 - rust-lang#78756 (Update cargo)
 - rust-lang#78757 (Improve and clean up some intra-doc links)
 - rust-lang#78758 (Fixed typo in comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9922933 into rust-lang:master Nov 5, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants