Merge pull request #95 from rust-native-ui/nora/msrv-1.40.0

NoraCodes · web-flow · commit e76abf697008 · 2020-08-08T21:18:22.000-05:00
meta: set msrv to 1.40
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,9 @@ jobs:
     - env: TEST_CMD=xvfb-run
       rust: nightly
     - env: TEST_CMD=xvfb-run
-      rust: beta
-    - env: TEST_CMD=xvfb-run
-      rust: stable
+      rust: 1.40.0
     - env: MACOSX_DEPLOYMENT_TARGET=10.7 SKIP_INSTALL=1
-      rust: stable
+      rust: 1.40.0 
       os: osx
 before_install: |
   [ "x$SKIP_INSTALL" != "x" ] || sudo apt-get -qq update
@@ -24,7 +22,7 @@ script:
     - cargo build --verbose --tests --examples
     - $TEST_CMD cargo test
 after_success: |
-  [ $TRAVIS_BRANCH = master ] &&
+  [ $TRAVIS_BRANCH = trunk] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&
   cd $TRAVIS_BUILD_DIR/iui/ &&
   cargo doc &&
diff --git a/README.md b/README.md
@@ -1,13 +1,15 @@
 # Improved User Interface
 ## A cross-platform UI toolkit for Rust based on libui
-[![travis-ci build status](https://travis-ci.com/rust-native-ui/libui-rs.svg?branch=master)](https://travis-ci.com/rust-native-ui/libui-rs)
-[![libui-rs appveyor build status badge](https://ci.appveyor.com/api/projects/status/github/leotindall/libui-rs)](https://ci.appveyor.com/project/rust-native-ui/libui-rs)
+[![travis-ci build status](https://travis-ci.com/rust-native-ui/libui-rs.svg?branch=trunk)](https://travis-ci.com/rust-native-ui/libui-rs)
+[![libui-rs appveyor build status badge](https://ci.appveyor.com/api/projects/status/github/noracodes/libui-rs)](https://ci.appveyor.com/project/rust-native-ui/libui-rs)
 ![actively developed badge](https://img.shields.io/badge/maintenance-actively--developed-brightgreen.svg)
 
 iui: [![iui crates.io version badge](https://img.shields.io/crates/v/iui.svg)](https://crates.io/crates/iui/)
 [![docs.rs for iui](https://docs.rs/iui/badge.svg)](https://docs.rs/iui)
+![rustc 1.40](https://img.shields.io/badge/rustc-1.40-blue)
 ui-sys: [![ui-sys crates.io version badge](https://img.shields.io/crates/v/ui-sys.svg)](https://crates.io/crates/ui-sys/)
 [![docs.rs for ui-sys](https://docs.rs/ui-sys/badge.svg)](https://docs.rs/ui)
+![rustc 1.40](https://img.shields.io/badge/rustc-1.40-blue)
 
 `iui` is a **simple** (about 4 kLOC of Rust), **small** (about 800kb, including `libui`), **easy to distribute** (one shared library) GUI library, providing a **Rusty** user interface library that binds to **native APIs** via the [libui](https://github.com/andlabs/libui) and the `ui-sys` bindings crate.
 
@@ -29,13 +31,13 @@ Then, in your code, all you have to do is:
 1. implement some [callbacks](https://docs.rs/iui/*/iui/controls/struct.Button.html#method.on_clicked) for user input, taking full advantage of Rust's concurrency protections
 1. call [`UI::main`](https://docs.rs/iui/*/iui/struct.UI.html#method.main), or take control over the event processing with an [`EventLoop`](https://docs.rs/iui/*/iui/struct.EventLoop.html), and voíla! A GUI!
 
-Or, you can track the `master` branch, which may be broken and whose API often changes, with:
+Or, you can track the `trunk` branch, which may be broken and whose API often changes, with:
 
 ```toml
-iui = { git = "https://github.com/rust-native-ui/libui-rs.git" }
+iui = { git = "https://github.com/rust-native-ui/libui-rs.git" branch="trunk" }
 ```
 
-We have documentation on [docs.rs](https://docs.rs/iui) for released versions and on [github](https://rust-native-ui.github.io/libui-rs/iui/index.html) for master.
+We have documentation on [docs.rs](https://docs.rs/iui) for released versions and on [github](https://rust-native-ui.github.io/libui-rs/iui/index.html) for `trunk`.
 
 ## Examples
 
@@ -51,7 +53,7 @@ This repository contains multiple Rust crates:
 * `iui` is the safe Rust wrapper, to be used by most users.
 * `ui-sys` is the raw unsafe bindings to the `libui` C code. `libui` is included as a submodule.
 
-Also be sure to look at our [changelog](CHANGELOG.md) and learn [how to contribute](CONTRIBUTING.md).
+Also be sure to look at our [changelog](CHANGELOG.md) and learn [how to contribute](CONTRIBUTING/CONTRIBUTING.md).
 
 
 ### Building ui-sys
diff --git a/appveyor.yml b/appveyor.yml
@@ -17,15 +17,15 @@ environment:
     secure: q8Wqx0brgfpOYFQqWauvucE2h0o1WYb41a3gKaCKV9QiE4eTz6qLNlqyC3mdsp4Q
 branches:
   only:
-    - master
+    - trunk
     - auto
 
 install:
   # If this is a PR and we're not allowed to test PRs, skip the whole build.
-  # Also if we're on the master branch no need to run the full test suite, so
+  # Also if we're on the trunk branch no need to run the full test suite, so
   # just do a smoke test.
   - if defined APPVEYOR_PULL_REQUEST_NUMBER if NOT defined ALLOW_PR appveyor exit
-  - if "%APPVEYOR_REPO_BRANCH%" == "master" if NOT defined ALLOW_PR appveyor exit
+  - if "%APPVEYOR_REPO_BRANCH%" == "trunk" if NOT defined ALLOW_PR appveyor exit
 
   # Install MSYS2 and MINGW (32-bit & 64-bit)
   - ps: |
@@ -51,7 +51,7 @@ install:
 
   # Install rust, x86_64-pc-windows-msvc host
   - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host=x86_64-pc-windows-msvc
+  - rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --default-toolchain=1.40.0
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
 
   # Install the target we're compiling for
diff --git a/iui/Cargo.toml b/iui/Cargo.toml
@@ -30,17 +30,15 @@ categories = ["gui", "os::macos-apis", "os::unix-apis", "os::windows-apis"]
 license = "MIT"
 
 [badges]
-# Travis CI: `repository` in format "<user>/<project>" is required.
-# `branch` is optional; default is `master`
-travis-ci = { repository = "rust-native-ui/libui-rs", branch = "master" }
-appveyor = { repository = "rust-native-ui/libui-rs", branch = "master" }
+travis-ci = { repository = "rust-native-ui/libui-rs", branch = "trunk" }
+appveyor = { repository = "rust-native-ui/libui-rs", branch = "trunk" }
 
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "1"
 libc = "0.2"
-failure = "0.1.1"
+failure = "0.1"
 ui-sys = { path = "../ui-sys", version = "0.2.1" }
 regex = "1"
 lazy_static = "1"
diff --git a/iui/src/controls/area.rs b/iui/src/controls/area.rs
@@ -36,7 +36,7 @@ impl RustAreaHandler {
                 DragBroken: Some(drag_broken),
                 KeyEvent: Some(key_event),
             },
-            trait_object: trait_object,
+            trait_object,
         });
 
         extern "C" fn draw(
diff --git a/iui/src/controls/entry.rs b/iui/src/controls/entry.rs
@@ -9,12 +9,12 @@ use std::ffi::{CStr, CString};
 use std::i32;
 use std::mem;
 use std::os::raw::c_void;
+use str_tools::{from_toolkit_string, to_toolkit_string};
+use ui::UI;
 use ui_sys::{
     self, uiCheckbox, uiCombobox, uiControl, uiEntry, uiMultilineEntry, uiRadioButtons, uiSlider,
     uiSpinbox,
 };
-use ui::UI;
-use str_tools::{from_toolkit_string, to_toolkit_string};
 
 pub trait NumericEntry {
     fn value(&self, ctx: &UI) -> i32;
@@ -223,9 +223,7 @@ impl TextEntry for PasswordEntry {
 
 impl TextEntry for MultilineEntry {
     fn value(&self, _ctx: &UI) -> String {
-        unsafe {
-            from_toolkit_string(ui_sys::uiMultilineEntryText(self.uiMultilineEntry))
-        }
+        unsafe { from_toolkit_string(ui_sys::uiMultilineEntryText(self.uiMultilineEntry)) }
     }
 
     fn set_value(&mut self, _ctx: &UI, value: &str) {
diff --git a/iui/src/controls/layout.rs b/iui/src/controls/layout.rs
@@ -212,7 +212,7 @@ impl TabGroup {
             unsafe { ui_sys::uiTabDelete(self.uiTab, index) };
             Ok(n)
         } else {
-            Err(UIError::TabGroupIndexOutOfBounds { index: index, n: n })
+            Err(UIError::TabGroupIndexOutOfBounds { index, n })
         }
     }
 
diff --git a/iui/src/controls/mod.rs b/iui/src/controls/mod.rs
@@ -50,9 +50,7 @@ impl Clone for Control {
 impl Control {
     /// Creates a new `Control` object from an existing `*mut uiControl`.
     pub unsafe fn from_ui_control(ui_control: *mut uiControl) -> Control {
-        Control {
-            ui_control: ui_control,
-        }
+        Control { ui_control }
     }
 
     /// Returns the underlying `*mut uiControl`.
diff --git a/iui/src/draw/brush.rs b/iui/src/draw/brush.rs
@@ -58,7 +58,7 @@ impl Brush {
                     Y1: linear_gradient_brush.end_y,
                     OuterRadius: 0.0,
                     Stops: linear_gradient_brush.stops.as_ptr() as *mut BrushGradientStop,
-                    NumStops: linear_gradient_brush.stops.len(),
+                    NumStops: linear_gradient_brush.stops.len() as u64,
                 },
                 phantom: PhantomData,
             },
@@ -77,7 +77,7 @@ impl Brush {
                     Y1: radial_gradient_brush.outer_circle_center_y,
                     OuterRadius: radial_gradient_brush.outer_radius,
                     Stops: radial_gradient_brush.stops.as_ptr() as *mut BrushGradientStop,
-                    NumStops: radial_gradient_brush.stops.len(),
+                    NumStops: radial_gradient_brush.stops.len() as u64,
                 },
                 phantom: PhantomData,
             },
diff --git a/iui/src/draw/strokeparams.rs b/iui/src/draw/strokeparams.rs
@@ -1,7 +1,6 @@
 use draw::DrawContext;
 use std::marker::PhantomData;
 use std::os::raw::c_double;
-use ui::UI;
 use ui_sys::uiDrawStrokeParams;
 
 pub use ui_sys::uiDrawLineCap as LineCap;
@@ -32,7 +31,7 @@ impl StrokeParams {
                 Thickness: self.thickness,
                 MiterLimit: self.miter_limit,
                 Dashes: self.dashes.as_ptr() as *mut c_double,
-                NumDashes: self.dashes.len(),
+                NumDashes: self.dashes.len() as u64,
                 DashPhase: self.dash_phase,
             },
             phantom: PhantomData,
diff --git a/iui/src/lib.rs b/iui/src/lib.rs
@@ -14,7 +14,7 @@
 //! 1. implement some [callbacks](https://docs.rs/iui/*/iui/controls/struct.Button.html#method.on_clicked) for user input, taking full advantage of Rust's concurrency protections
 //! 1. call [`UI::main`](https://docs.rs/iui/*/iui/struct.UI.html#method.main), or take control over the event processing with an [`EventLoop`](https://docs.rs/iui/*/iui/struct.EventLoop.html), and voíla! A GUI!
 //!
-//! For code examples, see the [examples](https://github.com/rust-native-ui/libui-rs/blob/master/iui/examples/)
+//! For code examples, see the [examples](https://github.com/rust-native-ui/libui-rs/blob/trunk/iui/examples/)
 //! directory.
 
 #[macro_use]
@@ -24,8 +24,8 @@ extern crate failure;
 #[macro_use]
 extern crate lazy_static;
 extern crate libc;
-extern crate ui_sys;
 extern crate regex;
+extern crate ui_sys;
 
 mod callback_helpers;
 mod compile_tests;
@@ -34,8 +34,8 @@ pub mod draw;
 mod error;
 mod ffi_tools;
 pub mod menus;
-mod ui;
 pub mod str_tools;
+mod ui;
 
 pub use error::UIError;
 pub use ui::{EventLoop, UI};
diff --git a/iui/src/str_tools.rs b/iui/src/str_tools.rs
@@ -27,7 +27,7 @@ pub fn insert_dual_endings(s: &str) -> String {
 /// # Panics
 /// Panics if it isn't possible to create a CString from the given string.
 pub fn to_toolkit_string(s: &str) -> CString {
-    let data = if cfg!(windows) { 
+    let data = if cfg!(windows) {
         insert_dual_endings(s).as_bytes().to_vec()
     } else {
         s.as_bytes().to_vec()
@@ -36,7 +36,7 @@ pub fn to_toolkit_string(s: &str) -> CString {
 }
 
 /// Converts a `*mut c_char` to a String guaranteed to use LF line endings.
-/// 
+///
 /// # Unsafety
 /// Has the same unsafety as [CStr::from_ptr](https://doc.rust-lang.org/std/ffi/struct.CStr.html#method.from_ptr).
 pub unsafe fn from_toolkit_string(c: *mut c_char) -> String {
@@ -49,30 +49,33 @@ mod test {
 
     #[test]
     fn strip_dual_endings_to_single() {
-        assert_eq!(strip_dual_endings("Line 1\r\nLine 2\r\n"),
-                   "Line 1\nLine 2\n");
+        assert_eq!(
+            strip_dual_endings("Line 1\r\nLine 2\r\n"),
+            "Line 1\nLine 2\n"
+        );
     }
 
     #[test]
     fn insert_dual_endings_basic() {
-        assert_eq!(insert_dual_endings("Line 1\nLine 2\n"),
-                   "Line 1\r\nLine 2\r\n");
+        assert_eq!(
+            insert_dual_endings("Line 1\nLine 2\n"),
+            "Line 1\r\nLine 2\r\n"
+        );
     }
 
     #[test]
     fn insert_dual_endings_nodupe() {
-        assert_eq!(insert_dual_endings("Line 1\r\nLine 2\r\n"),
-                   "Line 1\r\nLine 2\r\n");
+        assert_eq!(
+            insert_dual_endings("Line 1\r\nLine 2\r\n"),
+            "Line 1\r\nLine 2\r\n"
+        );
     }
-    
+
     #[test]
     fn test_toolkit_roundtripping() {
         let initial_string = "Here is some test data.\n\nMultiline!\n";
         let toolkit_string = to_toolkit_string(initial_string);
-        let roundtripped_string = unsafe {
-            from_toolkit_string(toolkit_string.into_raw())
-        };
+        let roundtripped_string = unsafe { from_toolkit_string(toolkit_string.into_raw()) };
         assert_eq!(initial_string, &roundtripped_string);
     }
 }
-
diff --git a/iui/src/ui.rs b/iui/src/ui.rs
@@ -74,7 +74,7 @@ impl UI {
         unsafe {
             // Create the magic value needed to init libUI
             let mut init_options = ui_sys::uiInitOptions {
-                Size: mem::size_of::<ui_sys::uiInitOptions>(),
+                Size: mem::size_of::<ui_sys::uiInitOptions>() as u64,
             };
 
             // Actually start up the library's functionality
diff --git a/ui-sys/Cargo.toml b/ui-sys/Cargo.toml
@@ -31,10 +31,8 @@ links = "ui"
 build = "build.rs"
 
 [badges]
-# Travis CI: `repository` in format "<user>/<project>" is required.
-# `branch` is optional; default is `master`
-travis-ci = { repository = "rust-native-ui/libui-rs", branch = "master" }
-appveyor = { repository = "rust-native-ui/libui-rs", branch = "master" }
+travis-ci = { repository = "rust-native-ui/libui-rs", branch = "trunk" }
+appveyor = { repository = "rust-native-ui/libui-rs", branch = "trunk" }
 
 maintenance = { status = "actively-developed" }
 
@@ -48,7 +46,7 @@ build = []
 libc = "0.2"
 
 [build-dependencies]
-bindgen = "0.31"
+bindgen = "0.54"
 cc = "1.0"
 embed-resource = "1.3"
 pkg-config = "0.3"

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ impl TabGroup {`
`212`	`212`	`unsafe { ui_sys::uiTabDelete(self.uiTab, index) };`
`213`	`213`	`Ok(n)`
`214`	`214`	`} else {`
`215`		`- Err(UIError::TabGroupIndexOutOfBounds { index: index, n: n })`
	`215`	`+ Err(UIError::TabGroupIndexOutOfBounds { index, n })`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`