diff options
| author | bors <bors@rust-lang.org> | 2019-06-16 04:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-16 04:46:14 +0000 |
| commit | 374c63e0fc356eb61b1966cb6026a2a49fe9226d (patch) | |
| tree | 165c6815c4a77a98a3d2f243ba0825d51faf7221 /src/libsyntax_ext | |
| parent | 0dc9e9c10ca6dc78cba8b9f9b15038c977b10a77 (diff) | |
| parent | cd9bb48f7f6755fb32abf50799d3a6873c9af160 (diff) | |
| download | rust-374c63e0fc356eb61b1966cb6026a2a49fe9226d.tar.gz rust-374c63e0fc356eb61b1966cb6026a2a49fe9226d.zip | |
Auto merge of #61886 - Centril:rollup-3p3m2fu, r=Centril
Rollup of 6 pull requests Successful merges: - #61447 (Add some Vec <-> VecDeque documentation) - #61704 (Pass LLVM linker flags to librustc_llvm build) - #61829 (rustbuild: include llvm-libunwind in dist tarball) - #61832 (update miri) - #61866 (Remove redundant `clone()`s) - #61869 (Cleanup some new active feature gates) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/format.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/proc_macro_server.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 85b524786b2..f44a6e7efa4 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -887,7 +887,7 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt<'_>, }; let fmt_str = &*fmt.node.0.as_str(); // for the suggestions below - let mut parser = parse::Parser::new(fmt_str, str_style, skips.clone(), append_newline); + let mut parser = parse::Parser::new(fmt_str, str_style, skips, append_newline); let mut unverified_pieces = Vec::new(); while let Some(piece) = parser.next() { diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs index 00a420d3fa8..b5d5a38ce5b 100644 --- a/src/libsyntax_ext/proc_macro_server.rs +++ b/src/libsyntax_ext/proc_macro_server.rs @@ -409,7 +409,7 @@ impl server::TokenStream for Rustc<'_> { } fn from_str(&mut self, src: &str) -> Self::TokenStream { parse::parse_stream_from_source_str( - FileName::proc_macro_source_code(src.clone()), + FileName::proc_macro_source_code(src), src.to_string(), self.sess, Some(self.call_site), |
