diff options
| author | bors <bors@rust-lang.org> | 2018-11-30 19:24:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-30 19:24:17 +0000 |
| commit | d09466ceb1374bd0ff1c490bfd50133b8ca67558 (patch) | |
| tree | f7d8b25b1458f3510341df1ff85dba2a910fecf3 /src/libsyntax/parse/parser.rs | |
| parent | d48ab693d1ce99f30c0cf9abdf45c209824fe825 (diff) | |
| parent | a6c477152026f9b652bbca3fd1dbe13c7a47ffdf (diff) | |
| download | rust-d09466ceb1374bd0ff1c490bfd50133b8ca67558.tar.gz rust-d09466ceb1374bd0ff1c490bfd50133b8ca67558.zip | |
Auto merge of #56381 - kennytm:rollup, r=kennytm
Rollup of 19 pull requests
Successful merges:
- #55011 (Add libstd Cargo feature "panic_immediate_abort")
- #55821 (Use sort_by_cached_key when the key function is not trivial/free)
- #56014 (add test for issue #21335)
- #56131 (Assorted tweaks)
- #56214 (Implement chalk unification routines)
- #56216 (Add TryFrom<&[T]> for [T; $N] where T: Copy)
- #56268 (Reuse the `P` in `InvocationCollector::fold_{,opt_}expr`.)
- #56324 (Use raw_entry for more efficient interning)
- #56336 (Clean up and streamline the pretty-printer)
- #56337 (Fix const_fn ICE with non-const function pointer)
- #56339 (Remove not used option)
- #56341 (Rename conversion util; remove duplicate util in librustc_codegen_llvm.)
- #56349 (rustc 1.30.0's linker flavor inference is a non-backwards compat change to -Clinker)
- #56355 (Add inline attributes and add unit to CommonTypes)
- #56360 (Optimize local linkchecker program)
- #56364 (Fix panic with outlives in existential type)
- #56365 (Stabilize self_struct_ctor feature.)
- #56367 (Moved some feature gate tests to correct location)
- #56373 (Update books)
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 506199b60ad..f13bb7df0b4 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2791,7 +2791,7 @@ impl<'a> Parser<'a> { s.print_usize(float.trunc() as usize)?; s.pclose()?; s.s.word(".")?; - s.s.word(fstr.splitn(2, ".").last().unwrap()) + s.s.word(fstr.splitn(2, ".").last().unwrap().to_string()) }); err.span_suggestion_with_applicability( lo.to(self.prev_span), |