bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove space after negative sign in Literal to_string

Browse source
This commit is contained in:
David Tolnay 2021-07-19 01:16:36 -07:00
parent d5fd37f00f
commit 3744dc8687
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_expand/src/proc_macro_server.rs
View file

@ -582,6 +582,9 @@ impl server::Literal for Rustc<'_> {
Ok(Literal { lit, span: self.call_site }) Ok(Literal { lit, span: self.call_site })
} }
fn to_string(&mut self, literal: &Self::Literal) -> String {
literal.lit.to_string()
}
fn debug_kind(&mut self, literal: &Self::Literal) -> String { fn debug_kind(&mut self, literal: &Self::Literal) -> String {
format!("{:?}", literal.lit.kind) format!("{:?}", literal.lit.kind)
} }

1
library/proc_macro/src/bridge/mod.rs
View file

@ -109,6 +109,7 @@ macro_rules! with_api {
fn drop($self: $S::Literal); fn drop($self: $S::Literal);
fn clone($self: &$S::Literal) -> $S::Literal; fn clone($self: &$S::Literal) -> $S::Literal;
fn from_str(s: &str) -> Result<$S::Literal, ()>; fn from_str(s: &str) -> Result<$S::Literal, ()>;
fn to_string($self: &$S::Literal) -> String;
fn debug_kind($self: &$S::Literal) -> String; fn debug_kind($self: &$S::Literal) -> String;
fn symbol($self: &$S::Literal) -> String; fn symbol($self: &$S::Literal) -> String;
fn suffix($self: &$S::Literal) -> Option<String>; fn suffix($self: &$S::Literal) -> Option<String>;

2
library/proc_macro/src/lib.rs
View file

@ -1195,7 +1195,7 @@ impl FromStr for Literal {
#[stable(feature = "proc_macro_lib", since = "1.15.0")] #[stable(feature = "proc_macro_lib", since = "1.15.0")]
impl ToString for Literal { impl ToString for Literal {
fn to_string(&self) -> String { fn to_string(&self) -> String {
TokenStream::from(TokenTree::from(self.clone())).to_string() self.0.to_string()
} }
} }

6
src/test/ui/proc-macro/auxiliary/api/parse.rs
View file

@ -6,8 +6,8 @@ pub fn test() {
} }
fn test_display_literal() { fn test_display_literal() {
assert_eq!(Literal::isize_unsuffixed(-10).to_string(), "- 10"); assert_eq!(Literal::isize_unsuffixed(-10).to_string(), "-10");
assert_eq!(Literal::isize_suffixed(-10).to_string(), "- 10isize"); assert_eq!(Literal::isize_suffixed(-10).to_string(), "-10isize");
} }
fn test_parse_literal() { fn test_parse_literal() {
@ -18,7 +18,7 @@ fn test_parse_literal() {
assert_eq!("b\"\"".parse::<Literal>().unwrap().to_string(), "b\"\""); assert_eq!("b\"\"".parse::<Literal>().unwrap().to_string(), "b\"\"");
assert_eq!("r##\"\"##".parse::<Literal>().unwrap().to_string(), "r##\"\"##"); 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_eq!("-10ulong".parse::<Literal>().unwrap().to_string(), "- 10ulong"); assert_eq!("-10ulong".parse::<Literal>().unwrap().to_string(), "-10ulong");
assert!("true".parse::<Literal>().is_err()); assert!("true".parse::<Literal>().is_err());
assert!(".8".parse::<Literal>().is_err()); assert!(".8".parse::<Literal>().is_err());