-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #2615 - lancethepants:TIOCGWINSZ, r=Amanieu
define TIOCGWINSZ as c_ulong under arm-uclibc. I'm trying to bring up a new target for rust, `armv7-unknown-linux-uclibceabi (softfloat)`. rust-lang/rust#92383 Looks like a lot of work has already been hashed out from the recent addition of `armv7-unknown-linux-uclibceabihf`. The only issue I'm currently seeing is when I encounter `TIOCGWINSZ` in a couple places. This is the error I see. ``` Compiling termize v0.1.1 (/mmc/.cargo/registry/src/github.com-1285ae84e5963aae/termize-0.1.1) error[E0277]: the trait bound `u32: From<i32>` is not satisfied --> src/platform/unix.rs:12:43 | 12 | let mut result = ioctl(STDOUT_FILENO, TIOCGWINSZ.into(), &mut window); | ----- ^^^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `u32` | | | required by a bound introduced by this call | = help: the following implementations were found: <u32 as From<Ipv4Addr>> <u32 as From<NonZeroU32>> <u32 as From<bool>> <u32 as From<char>> and 2 others = note: required because of the requirements on the impl of `Into<u32>` for `i32` error[E0277]: the trait bound `u32: From<i32>` is not satisfied ``` I see the error in the `termize` crate, and also `shell.rs` in the cargo source. My current fix is to define TIOCGWINSZ as c_ulong under arm-uclibc. I don't want to break anything with the established `armv7-unknown-linux-uclibceabihf` target so perhaps `@skrap` could chime in and take a look. Maybe a better solutions exists.
- Loading branch information
Showing
34 changed files
with
327 additions
and
897 deletions.
There are no files selected for viewing
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
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
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
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
Oops, something went wrong.