Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ICE due to carriage return w/ multibyte char #75972

Merged
merged 1 commit into from
Aug 28, 2020

Conversation

JulianKnodt
Copy link
Contributor

@JulianKnodt JulianKnodt commented Aug 27, 2020

Based off of this commit

Fixes #70381

CC: @Dylan-DPC

@rust-highfive
Copy link
Collaborator

r? @lcnr

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 27, 2020
@estebank
Copy link
Contributor

r? @estebank
@bors r=rollup

@bors
Copy link
Contributor

bors commented Aug 27, 2020

📌 Commit ed9df28 has been approved by rollup

@rust-highfive rust-highfive assigned estebank and unassigned lcnr Aug 27, 2020
@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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 27, 2020
@Dylan-DPC-zz
Copy link

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2020
…albini

Rollup of 12 pull requests

Successful merges:

 - rust-lang#75330 (Improve rendering of crate features via doc(cfg))
 - rust-lang#75927 (Use intra-doc links in `core::macros`)
 - rust-lang#75941 (Clean up E0761 explanation)
 - rust-lang#75943 (Fix potential UB in align_offset doc examples)
 - rust-lang#75946 (Error use explicit intra-doc link and fix text)
 - rust-lang#75955 (Use intra-doc links in `core::future::future` and `core::num::dec2flt`)
 - rust-lang#75967 (Fix typo in `std::hint::black_box` docs)
 - rust-lang#75972 (Fix ICE due to carriage return w/ multibyte char)
 - rust-lang#75989 (Rename rustdoc/test -> rustdoc/doctest)
 - rust-lang#75996 (fix wording in release notes)
 - rust-lang#75998 (Add InstrProfilingPlatformFuchsia.c to profiler_builtins)
 - rust-lang#76000 (Adds --bless support to test/run-make-fulldeps)

Failed merges:

r? @ghost
@bors bors merged commit cd77b62 into rust-lang:master Aug 28, 2020
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE when combining "\r", unicode, and unused parameter in format string
7 participants