Merge remote-tracking branch 'upstream/master' into 0.22maj

Signed-off-by: Hal Gentz <zegentzy@protonmail.com>

Author: goddessfreya

.travis.yml

@@ -36,13 +36,13 @@ matrix:
       os: osx
       rust: stable
 
-    # # iOS
-    # - env: TARGET=x86_64-apple-ios
-    #   os: osx
-    #   rust: nightly
-    # - env: TARGET=x86_64-apple-ios
-    #   os: osx
-    #   rust: stable
+    # iOS
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: nightly
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: stable
 
 addons:
   apt:

glutin/src/api/ios.rs

@@ -207,7 +207,7 @@ impl Context {
         let win = builder.build(el)?;
         let context = unsafe {
             let eagl_context = Context::create_context(version)?;
-            let view = win.uiview() as ffi::id;
+            let view = win.ui_view() as ffi::id;
             let mut context = Context { eagl_context, view };
             context.init_context(&win);
             context
@@ -223,7 +223,7 @@ impl Context {
         size: dpi::PhysicalSize,
     ) -> Result<Self, CreationError> {
         let wb = WindowBuilder::new()
-            .with_visibility(false)
+            .with_visible(false)
             .with_inner_size(size.to_logical(1.));
         Self::new_windowed(wb, el, pf_reqs, gl_attr)
             .map(|(_window, context)| context)

glutin/src/platform.rs

@@ -21,6 +21,15 @@ pub mod unix;
 pub mod windows;
 /// Platform-specific methods for desktop operating systems.
 pub mod desktop {
+    #![cfg(any(
+        target_os = "windows",
+        target_os = "macos",
+        target_os = "linux",
+        target_os = "dragonfly",
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "openbsd",
+    ))]
     pub use winit::platform::desktop::*;
 }