From 073bd767f247161285d38b3628dafd48e6549986 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@icloud.com>
Date: Wed, 10 Aug 2022 17:50:44 -0700
Subject: [PATCH] Fixed build errors in json_language

---
 .cargo/config.toml               |   1 +
 .github/workflows/.ci.yml.swp    | Bin 12288 -> 0 bytes
 plugins/json_language/src/lib.rs |  23 ++++++++++-------------
 3 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 .github/workflows/.ci.yml.swp

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 4dddb54d24..cf5c88d091 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,6 @@
 [target.'cfg(all())']
 rustflags = [
+    "-Dwarnings",
     "-Aclippy::reversed_empty_ranges",
     "-Aclippy::missing_safety_doc",
     "-Aclippy::let_unit_value",
diff --git a/.github/workflows/.ci.yml.swp b/.github/workflows/.ci.yml.swp
deleted file mode 100644
index 063ded33eec61c5c7dd50a9cea1af60dc3d6edfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O^6&t6vr#^GcjN2K|BcM8rT@@>HUx;j0Dm<nZz+WGt2C3qPes+-8D0v?dfj2
zx@WS9F$h9bR1ihMiw6&S5ibEf<sf*7qB-bMBnJ)n0fP8-5cJ>EJv}{>%`WjEM62Pq
zy;Jq-)vJHKdeh5xW9n$BO!wtx2(Dd(oGAX%xO~qmJGO^}bgUJ&YO|<k-K!ki38l=8
zdDmT0G|SJ~uEFflVNWLxRnK=%a3c`vDQ>E{mKC(ahT3!em8R|Xglbs1)y~-1QBU%d
zR6r_l{R(U+voq6E(YX63?xT0zxqSUD<Or#NR6r^q6_5%@1*8H}0jYpg;D%Ko@HUaN
zh<<aj0xP+18oMVS<xMIe6_5%@1*8H}0jYpgKq?>=kP1izqykcb8&Cme67tDSguHMI
zg2(^=2Y>(nzLSvOz|Y`&@D;cOJ_a9xcfp(BCGa9R2W+qmG;jdq!8EuR>;ix8Amk@-
z1zZFdz}w(8;DSZ47i<Qbz?JQUd<4#eH^A%Q6nG3g3TD9`uoFD9jgXVz37~*I;AZgU
z9fW)VE`sym9q=l67Mune_;oAV!Q-F;X2EXo*A_x9gZIH%a10y;4}-hG7VzWkg!}+5
zf%m{$;5l#(w1En?f-T^?+X(p_d<I?y9L#{-U>o@MRzki3AAmF9AeaLb{DJ-X8hi>a
zfM~y-2lA2%NCo~23efaAT&h2^Jg?WQM~am^-F^Br72NQ7AadCrdgcrn4B<{UpMIdU
z;hL*?Ix&%Ha=YB``BuR5H1I>7>1kRv7ieXEiwCODZO#N&k8?9;c3K%b(`U_KY;+H=
zZVe~4nn|?q6^LW#+Y`UrmGgP?K{|<_LJe3;sNKm2vf(?dgSeJG+hrzYo<|#@W7?bs
zE=}U0Rx|w-9+I#W8j2`(;Wh)jQ|1Yk8G+?GN~^6T0}phkQ9#qnV+eTTwZ;LBYq0ie
zhfAdU_a}>Nb7l&)!z^bqyUsY;I7Xp{{q-u)%4(wRKzAlx);fX=UX!DK=tQbSlhB6G
z9HTv4DEgp^;agsy##)ZKF8G`UJfrp6W4p|@Oc*N29syw!FBB91qpenGyt1Q-Upnxc
zI;PY>0wVe*v&Aq?N2MRt(P(pH#SPaGu#og1bv$>tLP{OiOxKjBlhbpPX#nfZBzO>d
zN;LTD%_=z}V75&w=*>>$hXR9=l%vcvX^)A{?2Lk&mCj1Bo#S>V_s!{Z4=FegHdjpM
z_pG7*YuPjA8|@7TgkH3v6u~y^p}wg<ERo_UMMZ&jEXV5LB~F@L{j7Q_`8e3h!MbaR
zzuzSS?ukKB&=waLih8A5*J`EXTD?@Q=!@FY(y?mo;AmxA$8dOp)-YOLD%L7mxwxUX
zf#J|wSu0eR^g^*#FC8isw0iLxp<UZ<9bcpIT;*agGE=yfr0S*m3T`)*whKMYejDT$
zitEJE#^-20u9HX+Si}cCKTN*<ei^9iF8VCnq>9q89Dy4WRcWFEggzHEop9hYGBsS=
zW(^8^=389!Z4$#MS8zaM#{m}s97a`1c+BAV-EoyBvoHZmGJ?`UveZzsq7kt_ifb*O
zhHZJ?>X=um9K^}-9m{E91scjkWR%bQJgOnw)Op7XR&^A@7S@z8=vYEvkS<u0!@zWn
zY_H7&J#?%<N2yD{7PH~T^Q2*BBL2UZD#Pt~uEU+6U)8SCDJf|GZoR23FVzn%Xor{b
z*?j5m-pEmlk}%m*1y5HS9<*%Y_7gZyPPh$}IXH>t)aSLrk$O!lpb$-?t)SHoSM^e*
zP%D;;mAbZ&r&DQjy;v*jh3Z1JmZ!|_u~k9(!KDFB?A;qbyT#w@c*H@M7uvS&^Cv@u
jJ}9pWo#-Z}(R0<XIeIGSyBqZ&@U#|H5E38tLW%qh_bp}e

diff --git a/plugins/json_language/src/lib.rs b/plugins/json_language/src/lib.rs
index 1503f9f8b2..b3c70da7a1 100644
--- a/plugins/json_language/src/lib.rs
+++ b/plugins/json_language/src/lib.rs
@@ -1,13 +1,12 @@
+use std::{fs, path::PathBuf};
+
 use plugin::prelude::*;
 use serde::Deserialize;
-use std::fs;
-use std::path::PathBuf;
 
 #[import]
 fn command(string: &str) -> Option<Vec<u8>>;
 
-const BIN_PATH: &'static str =
-    "node_modules/vscode-json-languageserver/bin/vscode-json-languageserver";
+const BIN_PATH: &str = "node_modules/vscode-json-languageserver/bin/vscode-json-languageserver";
 
 #[export]
 pub fn name() -> &'static str {
@@ -51,13 +50,11 @@ pub fn fetch_server_binary(container_dir: PathBuf, version: String) -> Result<Pa
             return Err("failed to install vscode-json-languageserver".to_string());
         }
 
-        if let Some(mut entries) = fs::read_dir(&container_dir).ok() {
-            while let Some(entry) = entries.next() {
-                if let Some(entry) = entry.ok() {
-                    let entry_path = entry.path();
-                    if entry_path.as_path() != version_dir {
-                        fs::remove_dir_all(&entry_path).ok();
-                    }
+        if let Ok(entries) = fs::read_dir(&container_dir) {
+            for entry in entries.flatten() {
+                let entry_path = entry.path();
+                if entry_path.as_path() != version_dir {
+                    fs::remove_dir_all(&entry_path).ok();
                 }
             }
         }
@@ -69,9 +66,9 @@ pub fn fetch_server_binary(container_dir: PathBuf, version: String) -> Result<Pa
 #[export]
 pub fn cached_server_binary(container_dir: PathBuf) -> Option<PathBuf> {
     let mut last_version_dir = None;
-    let mut entries = fs::read_dir(&container_dir).ok()?;
+    let entries = fs::read_dir(&container_dir).ok()?;
 
-    while let Some(entry) = entries.next() {
+    for entry in entries {
         let entry = entry.ok()?;
         if entry.file_type().ok()?.is_dir() {
             last_version_dir = Some(entry.path());