From c1fa08319e7395bec657596c48de60079251f8c1 Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Thu, 10 Dec 2020 10:03:16 -0800
Subject: [PATCH] deps: upgrade euclid -> 0.22

---
 Cargo.lock                        | 19 +++++--------------
 wezterm-font/Cargo.toml           |  2 +-
 wezterm-gui/Cargo.toml            |  2 +-
 wezterm-gui/src/gui/glyphcache.rs |  2 +-
 wezterm-gui/src/gui/termwindow.rs |  2 +-
 wezterm-input-types/Cargo.toml    |  2 +-
 window/Cargo.toml                 |  2 +-
 7 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd9632ca2..9a8752565 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1132,15 +1132,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "euclid"
-version = "0.20.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad"
-dependencies = [
- "num-traits 0.2.14",
-]
-
 [[package]]
 name = "euclid"
 version = "0.22.1"
@@ -1567,7 +1558,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc7cccefbf418f663e11e9500326f46a44273dc598210bbedc8bbe95e696531f"
 dependencies = [
- "euclid 0.22.1",
+ "euclid",
  "svg_fmt",
 ]
 
@@ -4446,7 +4437,7 @@ dependencies = [
  "core-foundation 0.9.1",
  "core-text",
  "dwrote",
- "euclid 0.20.14",
+ "euclid",
  "fontconfig",
  "freetype",
  "harfbuzz",
@@ -4481,7 +4472,7 @@ dependencies = [
  "downcast-rs",
  "embed-resource",
  "env-bootstrap",
- "euclid 0.20.14",
+ "euclid",
  "filedescriptor",
  "hdrhistogram",
  "http_req",
@@ -4545,7 +4536,7 @@ name = "wezterm-input-types"
 version = "0.1.0"
 dependencies = [
  "bitflags 1.2.1",
- "euclid 0.20.14",
+ "euclid",
  "serde",
 ]
 
@@ -4659,7 +4650,7 @@ dependencies = [
  "cocoa",
  "core-foundation 0.7.0",
  "core-graphics 0.19.2",
- "euclid 0.20.14",
+ "euclid",
  "filedescriptor",
  "gl_generator",
  "glium",
diff --git a/wezterm-font/Cargo.toml b/wezterm-font/Cargo.toml
index 8d3981e43..f33fa4936 100644
--- a/wezterm-font/Cargo.toml
+++ b/wezterm-font/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 allsorts = { git = "https://github.com/yeslogic/allsorts.git", rev="3947164a201ab5e15d5f23204faaaaaad52531aa" }
 anyhow = "1.0"
 config = { path = "../config" }
-euclid = "0.20"
+euclid = "0.22"
 freetype = { path = "../deps/freetype" }
 harfbuzz = { path = "../deps/harfbuzz" }
 lazy_static = "1.4"
diff --git a/wezterm-gui/Cargo.toml b/wezterm-gui/Cargo.toml
index 453ffc62e..c50415642 100644
--- a/wezterm-gui/Cargo.toml
+++ b/wezterm-gui/Cargo.toml
@@ -22,7 +22,7 @@ config = { path = "../config" }
 dirs = "2.0"
 downcast-rs = "1.0"
 env-bootstrap = { path = "../env-bootstrap" }
-euclid = "0.20"
+euclid = "0.22"
 filedescriptor = { version="0.7", path = "../filedescriptor" }
 hdrhistogram = "7.1"
 http_req = {version="0.7", default-features=false, features=["rust-tls"]}
diff --git a/wezterm-gui/src/gui/glyphcache.rs b/wezterm-gui/src/gui/glyphcache.rs
index 6fd291c92..d9e95db9c 100644
--- a/wezterm-gui/src/gui/glyphcache.rs
+++ b/wezterm-gui/src/gui/glyphcache.rs
@@ -250,7 +250,7 @@ impl<T: Texture2d> GlyphCache<T> {
 
             let (scale, raw_im) = if scale != 1.0 {
                 log::trace!(
-                    "physically scaling {:?} by {} bcos {}x{} > {}x{}",
+                    "physically scaling {:?} by {} bcos {}x{} > {:?}x{:?}",
                     info,
                     scale,
                     glyph.width,
diff --git a/wezterm-gui/src/gui/termwindow.rs b/wezterm-gui/src/gui/termwindow.rs
index c92759aee..6d8bf6753 100644
--- a/wezterm-gui/src/gui/termwindow.rs
+++ b/wezterm-gui/src/gui/termwindow.rs
@@ -2625,7 +2625,7 @@ impl TermWindow {
             -1.0,
             1.0,
         )
-        .to_column_arrays();
+        .to_arrays_transposed();
 
         let draw_params = glium::DrawParameters {
             // No alpha blending for the background layer: let's make
diff --git a/wezterm-input-types/Cargo.toml b/wezterm-input-types/Cargo.toml
index 12f0f1c25..4de0366da 100644
--- a/wezterm-input-types/Cargo.toml
+++ b/wezterm-input-types/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1.0"
-euclid = "0.20"
+euclid = "0.22"
 serde = {version="1.0", features = ["rc", "derive"]}
diff --git a/window/Cargo.toml b/window/Cargo.toml
index 1480980fb..a42655379 100644
--- a/window/Cargo.toml
+++ b/window/Cargo.toml
@@ -19,7 +19,7 @@ async-task = "1.2"
 anyhow = "1.0"
 thiserror = "1.0"
 bitflags = "1.0"
-euclid = "0.20"
+euclid = "0.22"
 guillotiere = "0.6"
 lazy_static = "1.4"
 libloading = { version = "0.6", optional=true }