Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-20 03:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rust] use FILE instead of _IO_FILE #1938

Browse Source 
also restore `NcFile` for `macos` to see if it makes a difference.
This commit is contained in:
joseLuís 2021-07-17 20:38:06 +02:00
parent 27a2b76c20
commit b6f6e08dce
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/src/file.rs
View File

@ -13,7 +13,7 @@ use libc::{
/// See [NcFile]. Notcurses functions expects this type of `*FILE` (a struct) /// See [NcFile]. Notcurses functions expects this type of `*FILE` (a struct)
#[allow(clippy::upper_case_acronyms)] #[allow(clippy::upper_case_acronyms)]
pub type FILE_NC = crate::ffi::_IO_FILE; pub type FILE_NC = crate::ffi::FILE;
/// See [NcFile]. The [`libc`](https://docs.rs/libc/) crate expects this type /// See [NcFile]. The [`libc`](https://docs.rs/libc/) crate expects this type
/// of `*FILE` (an opaque enum) /// of `*FILE` (an opaque enum)

2
rust/src/lib.rs
View File

@ -126,7 +126,6 @@ mod dimension;
mod direct; mod direct;
mod error; mod error;
mod fade; mod fade;
#[cfg(not(target_os = "macos"))]
mod file; mod file;
mod input; mod input;
mod macros; mod macros;
@ -149,7 +148,6 @@ pub use dimension::*;
pub use direct::*; pub use direct::*;
pub use error::*; pub use error::*;
pub use fade::*; pub use fade::*;
#[cfg(not(target_os = "macos"))]
pub use file::*; pub use file::*;
pub use macros::*; pub use macros::*;
pub use metric::*; pub use metric::*;

7
rust/src/notcurses/methods.rs
View File

@ -4,15 +4,12 @@ use core::ptr::{null, null_mut};
use crate::{ use crate::{
cstring, error, error_ref_mut, notcurses_init, rstring, Nc, NcAlign, NcBlitter, NcChannels, cstring, error, error_ref_mut, notcurses_init, rstring, Nc, NcAlign, NcBlitter, NcChannels,
NcDim, NcError, NcInput, NcLogLevel, NcOptions, NcPlane, NcResult, NcScale, NcStats, NcDim, NcError, NcFile, NcInput, NcLogLevel, NcOptions, NcPlane, NcResult, NcScale, NcStats,
NcStyle, NcStyleMethods, NcTime, NCOPTION_NO_ALTERNATE_SCREEN, NCOPTION_SUPPRESS_BANNERS, NcStyle, NcStyleMethods, NcTime, NCOPTION_NO_ALTERNATE_SCREEN, NCOPTION_SUPPRESS_BANNERS,
NCRESULT_ERR, NCSTYLE_BLINK, NCSTYLE_BOLD, NCSTYLE_ITALIC, NCSTYLE_NONE, NCSTYLE_STRUCK, NCRESULT_ERR, NCSTYLE_BLINK, NCSTYLE_BOLD, NCSTYLE_ITALIC, NCSTYLE_NONE, NCSTYLE_STRUCK,
NCSTYLE_UNDERCURL, NCSTYLE_UNDERLINE, NCSTYLE_UNDERCURL, NCSTYLE_UNDERLINE,
}; };
#[cfg(not(target_os = "macos"))]
use crate::NcFile;
/// # `NcOptions` Constructors /// # `NcOptions` Constructors
impl NcOptions { impl NcOptions {
/// New NcOptions. /// New NcOptions.
@ -297,7 +294,6 @@ impl Nc {
/// planes, from all piles. /// planes, from all piles.
/// ///
/// *C style function: [notcurses_debug()][crate::notcurses_debug].* /// *C style function: [notcurses_debug()][crate::notcurses_debug].*
#[cfg(not(target_os = "macos"))]
pub fn debug(&mut self, debugfp: &mut NcFile) { pub fn debug(&mut self, debugfp: &mut NcFile) {
unsafe { unsafe {
crate::notcurses_debug(self, debugfp.as_nc_ptr()); crate::notcurses_debug(self, debugfp.as_nc_ptr());
@ -584,7 +580,6 @@ impl Nc {
/// nothing will be written. /// nothing will be written.
/// ///
/// *C style function: [notcurses_render_to_file()][crate::notcurses_render_to_file].* /// *C style function: [notcurses_render_to_file()][crate::notcurses_render_to_file].*
#[cfg(not(target_os = "macos"))]
pub fn render_to_file(&mut self, fp: &mut NcFile) -> NcResult<()> { pub fn render_to_file(&mut self, fp: &mut NcFile) -> NcResult<()> {
error![unsafe { crate::notcurses_render_to_file(self, fp.as_nc_ptr()) }] error![unsafe { crate::notcurses_render_to_file(self, fp.as_nc_ptr()) }]
} }

2
rust/src/notcurses/test/reimplemented.rs
View File

@ -5,7 +5,6 @@ use std::io::Read;
use crate::{notcurses_init_test, notcurses_stop, NCRESULT_MAX}; use crate::{notcurses_init_test, notcurses_stop, NCRESULT_MAX};
#[cfg(not(target_os = "macos"))]
use crate::NcFile; use crate::NcFile;
#[test] #[test]
@ -146,7 +145,6 @@ fn notcurses_at_yx() {
#[test] #[test]
#[serial] #[serial]
#[cfg(not(target_os = "macos"))]
fn notcurses_debug() { fn notcurses_debug() {
unsafe { unsafe {
let nc = notcurses_init_test(); let nc = notcurses_init_test();