diff options
| author | bors <bors@rust-lang.org> | 2021-08-03 04:50:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-03 04:50:28 +0000 |
| commit | e91405b9d5c8dabb3e488bafb314147f1050f9b9 (patch) | |
| tree | e685ca7d120d1d9e26e06a1c4a64142c9f9da488 /src/test | |
| parent | 810b9267f38a398c28dd213bad4acc58dce0199a (diff) | |
| parent | 55ff45a5c25c49e665a9459b8d6ea03ae2c44476 (diff) | |
Auto merge of #87262 - dtolnay:negative, r=Aaron1011
Support negative numbers in Literal::from_str proc_macro::Literal has allowed negative numbers in a single literal token ever since Rust 1.29, using https://doc.rust-lang.org/stable/proc_macro/struct.Literal.html#method.isize_unsuffixed and similar constructors. ```rust let lit = proc_macro::Literal::isize_unsuffixed(-10); ``` However, the suite of constructors on Literal is not sufficient for all use cases, for example arbitrary precision floats, or custom suffixes in FFI macros. ```rust let lit = proc_macro::Literal::f64_unsuffixed(0.101001000100001000001000000100000001); // :( let lit = proc_macro::Literal::i???_suffixed(10ulong); // :( ``` For those, macros construct the literal using from_str instead, which preserves arbitrary precision, custom suffixes, base, and digit grouping. ```rust let lit = "0.101001000100001000001000000100000001".parse::<Literal>().unwrap(); let lit = "10ulong".parse::<Literal>().unwrap(); let lit = "0b1000_0100_0010_0001".parse::<Literal>().unwrap(); ``` However, until this PR it was not possible to construct a literal token that is **both** negative **and** preserving of arbitrary precision etc. This PR fixes `Literal::from_str` to recognize negative integer and float literals.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/proc-macro/auxiliary/api/parse.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/test/ui/proc-macro/auxiliary/api/parse.rs b/src/test/ui/proc-macro/auxiliary/api/parse.rs index 4105236b7f2..a304c5e81a4 100644 --- a/src/test/ui/proc-macro/auxiliary/api/parse.rs +++ b/src/test/ui/proc-macro/auxiliary/api/parse.rs @@ -1,9 +1,15 @@ use proc_macro::Literal; pub fn test() { + test_display_literal(); test_parse_literal(); } +fn test_display_literal() { + assert_eq!(Literal::isize_unsuffixed(-10).to_string(), "- 10"); + assert_eq!(Literal::isize_suffixed(-10).to_string(), "- 10isize"); +} + fn test_parse_literal() { assert_eq!("1".parse::<Literal>().unwrap().to_string(), "1"); assert_eq!("1.0".parse::<Literal>().unwrap().to_string(), "1.0"); @@ -12,7 +18,10 @@ fn test_parse_literal() { assert_eq!("b\"\"".parse::<Literal>().unwrap().to_string(), "b\"\""); assert_eq!("r##\"\"##".parse::<Literal>().unwrap().to_string(), "r##\"\"##"); assert_eq!("10ulong".parse::<Literal>().unwrap().to_string(), "10ulong"); + assert_eq!("-10ulong".parse::<Literal>().unwrap().to_string(), "- 10ulong"); + assert!("true".parse::<Literal>().is_err()); + assert!(".8".parse::<Literal>().is_err()); assert!("0 1".parse::<Literal>().is_err()); assert!("'a".parse::<Literal>().is_err()); assert!(" 0".parse::<Literal>().is_err()); @@ -20,4 +29,6 @@ fn test_parse_literal() { assert!("/* comment */0".parse::<Literal>().is_err()); assert!("0/* comment */".parse::<Literal>().is_err()); assert!("0// comment".parse::<Literal>().is_err()); + assert!("- 10".parse::<Literal>().is_err()); + assert!("-'x'".parse::<Literal>().is_err()); } |
