libterm: parse extended terminfo format #68036
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @KodrAus (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
KodrAus
reviewed
Jan 11, 2020
| fn read_le_u32(r: &mut dyn io::Read) -> io::Result<u32> { | ||
| let mut b = [0; 4]; | ||
| let mut amt = 0; | ||
| while amt < b.len() { |
There was a problem hiding this comment.
We should be able to use read_exact(&mut b) here.
euclio
force-pushed
the
libterm-ncurses6-fix
branch
from
caf3f3b
to
f9a5746
Compare
|
@bors r+ |
|
📌 Commit f9a5746 has been approved by |
bors
added
S-waiting-on-bors
tesuji
reviewed
Jan 12, 2020
| fn read_le_u32(r: &mut dyn io::Read) -> io::Result<u32> { | ||
| let mut b = [0; 4]; | ||
| r.read_exact(&mut b)?; | ||
| Ok((b[0] as u32) | ((b[1] as u32) << 8) | ((b[2] as u32) << 16) | ((b[3] as u32) << 24)) |
There was a problem hiding this comment.
Suggested change
| Ok((b[0] as u32) | ((b[1] as u32) << 8) | ((b[2] as u32) << 16) | ((b[3] as u32) << 24)) | |
| Ok(u32::from_le_bytes(b)) |
| n => amt += n, | ||
| } | ||
| } | ||
| r.read_exact(&mut b)?; | ||
| Ok((b[0] as u16) | ((b[1] as u16) << 8)) |
There was a problem hiding this comment.
Suggested change
| Ok((b[0] as u16) | ((b[1] as u16) << 8)) | |
| Ok(u16::from_le_bytes(b)) |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 12, 2020
libterm: parse extended terminfo format Fixes rust-lang#45728. Modifies libterm to parse the extended terminfo format introduced in ncurses 6.1. This fixes the lack of color in test output for users with newer ncurses versions. The ideal fix for this would be to migrate libtest to use `termcolor` (rust-lang#60349), but that's blocked for the foreseeable future.
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Jan 13, 2020
libterm: parse extended terminfo format Fixes rust-lang#45728. Modifies libterm to parse the extended terminfo format introduced in ncurses 6.1. This fixes the lack of color in test output for users with newer ncurses versions. The ideal fix for this would be to migrate libtest to use `termcolor` (rust-lang#60349), but that's blocked for the foreseeable future.
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jan 14, 2020
libterm: parse extended terminfo format Fixes rust-lang#45728. Modifies libterm to parse the extended terminfo format introduced in ncurses 6.1. This fixes the lack of color in test output for users with newer ncurses versions. The ideal fix for this would be to migrate libtest to use `termcolor` (rust-lang#60349), but that's blocked for the foreseeable future.
bors
added a commit
that referenced
this pull request
Jan 14, 2020
Rollup of 10 pull requests Successful merges: - #67854 (Use `report_in_external_macro` for internal lints) - #67989 (rustdoc: Don't allow `#![feature(...)]` on stable or beta) - #68036 (libterm: parse extended terminfo format) - #68127 (Clarify the relationship between `extended` and `tools` in `config.toml`) - #68143 (Forbid elided lifetimes within const generic parameter types) - #68150 (Document behavior of set_nonblocking on UnixListener) - #68166 (rustdoc: HTML escape arrows on help popup) - #68176 (Clean up err codes) - #68179 (Remove unneeded scope) - #68188 (Tweak assertion note in format check) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #45728.
Modifies libterm to parse the extended terminfo format introduced in ncurses 6.1. This fixes the lack of color in test output for users with newer ncurses versions.
The ideal fix for this would be to migrate libtest to use
termcolor(#60349), but that's blocked for the foreseeable future.