From 590fbf4f1fcc424dc16e4006887ee8c861cd7ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?joseLu=C3=ADs?= Date: Sat, 8 Aug 2020 17:49:12 +0200 Subject: [PATCH] move channels.rs to libnotcurses-sys crate --- rust/{notcurses => libnotcurses-sys}/src/channels.rs | 2 +- rust/libnotcurses-sys/src/lib.rs | 2 ++ rust/notcurses/src/lib.rs | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) rename rust/{notcurses => libnotcurses-sys}/src/channels.rs (99%) diff --git a/rust/notcurses/src/channels.rs b/rust/libnotcurses-sys/src/channels.rs similarity index 99% rename from rust/notcurses/src/channels.rs rename to rust/libnotcurses-sys/src/channels.rs index 4274fbc8c..fef827a15 100644 --- a/rust/notcurses/src/channels.rs +++ b/rust/libnotcurses-sys/src/channels.rs @@ -1,6 +1,6 @@ #![allow(dead_code)] -extern crate libnotcurses_sys as ffi; +use crate as ffi; // NOTE: There are several differences from the original functions in C: // diff --git a/rust/libnotcurses-sys/src/lib.rs b/rust/libnotcurses-sys/src/lib.rs index ed21cfeda..48d1b6974 100644 --- a/rust/libnotcurses-sys/src/lib.rs +++ b/rust/libnotcurses-sys/src/lib.rs @@ -2,6 +2,8 @@ #![allow(non_camel_case_types)] #![allow(non_snake_case)] +mod channels; + include!(concat!(env!("OUT_DIR"), "/bindings.rs")); pub fn ncplane_putstr(_n: *mut ncplane, _str: &str) -> i32 { diff --git a/rust/notcurses/src/lib.rs b/rust/notcurses/src/lib.rs index 6620cd5de..88bd18cdc 100644 --- a/rust/notcurses/src/lib.rs +++ b/rust/notcurses/src/lib.rs @@ -1,5 +1,3 @@ -mod channels; - extern crate libnotcurses_sys as ffi; pub fn getc_blocking(_n: *mut ffi::notcurses, _ni: &mut ffi::ncinput) -> u32 {