Skip to content

Commit 6fa665e

Browse files
Cargo Fix
1 parent 72d7a55 commit 6fa665e

File tree

2 files changed

+33
-34
lines changed

2 files changed

+33
-34
lines changed

src/run.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ pub fn run(
118118
} else if "exit" == contents[x].as_str() {
119119
std::process::exit(1);
120120
} else if "audio" == contents[x].as_str()
121-
&& uses[1] == "true".to_string()
122-
&& !("use" == contents[x - 1].as_str())
121+
&& uses[1] == *"true"
122+
&& "use" != contents[x - 1].as_str()
123123
{
124124
let contents_save = contents.clone();
125125
let memory_types_save = memory_types.clone();

src/run/functions.rs

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn log(
3737
func_par,
3838
func_code,
3939
dev,
40-
uses.clone(),
40+
uses,
4141
0,
4242
)
4343
.first()
@@ -230,7 +230,6 @@ pub fn getstring(
230230
if leng == 2 {
231231
imput_s.push_str(
232232
&(env::args()
233-
.map(|arg| arg.to_string())
234233
.collect::<Vec<String>>()
235234
.join("zzGVgfHaNtPMe7H9RRyx3rWC9JyyZdMkc2v")
236235
.to_owned())[..],
@@ -637,7 +636,7 @@ pub fn getstring(
637636
}
638637
}
639638
skips = leng;
640-
} else if vec[y] == "os.total_memory" && uses[0] == "true".to_string() {
639+
} else if vec[y] == "os.total_memory" && uses[0] == *"true" {
641640
use sysinfo::System;
642641
let mut sys = System::new_all();
643642
sys.refresh_all();
@@ -665,7 +664,7 @@ pub fn getstring(
665664
}
666665
}
667666
skips = leng;
668-
} else if vec[y] == "os.uptime" && uses[0] == "true".to_string() {
667+
} else if vec[y] == "os.uptime" && uses[0] == *"true" {
669668
use sysinfo::System;
670669
let mut sys = System::new_all();
671670
sys.refresh_all();
@@ -693,7 +692,7 @@ pub fn getstring(
693692
}
694693
}
695694
skips = leng;
696-
} else if vec[y] == "os.name" && uses[0] == "true".to_string() {
695+
} else if vec[y] == "os.name" && uses[0] == *"true" {
697696
use sysinfo::System;
698697
let mut sys = System::new_all();
699698
sys.refresh_all();
@@ -721,7 +720,7 @@ pub fn getstring(
721720
}
722721
}
723722
skips = leng;
724-
} else if vec[y] == "os.kernel_version" && uses[0] == "true".to_string() {
723+
} else if vec[y] == "os.kernel_version" && uses[0] == *"true" {
725724
use sysinfo::System;
726725
let mut sys = System::new_all();
727726
sys.refresh_all();
@@ -749,7 +748,7 @@ pub fn getstring(
749748
}
750749
}
751750
skips = leng;
752-
} else if vec[y] == "os.os_version" && uses[0] == "true".to_string() {
751+
} else if vec[y] == "os.os_version" && uses[0] == *"true" {
753752
use sysinfo::System;
754753
let mut sys = System::new_all();
755754
sys.refresh_all();
@@ -777,7 +776,7 @@ pub fn getstring(
777776
}
778777
}
779778
skips = leng;
780-
} else if vec[y] == "os.host_name" && uses[0] == "true".to_string() {
779+
} else if vec[y] == "os.host_name" && uses[0] == *"true" {
781780
use sysinfo::System;
782781
let mut sys = System::new_all();
783782
sys.refresh_all();
@@ -805,7 +804,7 @@ pub fn getstring(
805804
}
806805
}
807806
skips = leng;
808-
} else if vec[y] == "os.used_memory" && uses[0] == "true".to_string() {
807+
} else if vec[y] == "os.used_memory" && uses[0] == *"true" {
809808
use sysinfo::System;
810809
let mut sys = System::new_all();
811810
sys.refresh_all();
@@ -833,7 +832,7 @@ pub fn getstring(
833832
}
834833
}
835834
skips = leng;
836-
} else if vec[y] == "os.total_swap" && uses[0] == "true".to_string() {
835+
} else if vec[y] == "os.total_swap" && uses[0] == *"true" {
837836
use sysinfo::System;
838837
let mut sys = System::new_all();
839838
sys.refresh_all();
@@ -861,7 +860,7 @@ pub fn getstring(
861860
}
862861
}
863862
skips = leng;
864-
} else if vec[y] == "os.used_swap" && uses[0] == "true".to_string() {
863+
} else if vec[y] == "os.used_swap" && uses[0] == *"true" {
865864
use sysinfo::System;
866865
let mut sys = System::new_all();
867866
sys.refresh_all();
@@ -889,7 +888,7 @@ pub fn getstring(
889888
}
890889
}
891890
skips = leng;
892-
} else if vec[y] == "os.load_average.one" && uses[0] == "true".to_string() {
891+
} else if vec[y] == "os.load_average.one" && uses[0] == *"true" {
893892
use sysinfo::System;
894893
let mut sys = System::new_all();
895894
sys.refresh_all();
@@ -917,7 +916,7 @@ pub fn getstring(
917916
}
918917
}
919918
skips = leng;
920-
} else if vec[y] == "os.cpu_usage" && uses[0] == "true".to_string() {
919+
} else if vec[y] == "os.cpu_usage" && uses[0] == *"true" {
921920
use sysinfo::System;
922921
let mut sys = System::new_all();
923922
sys.refresh_all();
@@ -945,7 +944,7 @@ pub fn getstring(
945944
}
946945
}
947946
skips = leng;
948-
} else if vec[y] == "os.cpu_name" && uses[0] == "true".to_string() {
947+
} else if vec[y] == "os.cpu_name" && uses[0] == *"true" {
949948
use sysinfo::System;
950949
let mut sys = System::new_all();
951950
sys.refresh_all();
@@ -973,7 +972,7 @@ pub fn getstring(
973972
}
974973
}
975974
skips = leng;
976-
} else if vec[y] == "os.load_average.five" && uses[0] == "true".to_string() {
975+
} else if vec[y] == "os.load_average.five" && uses[0] == *"true" {
977976
use sysinfo::System;
978977
let mut sys = System::new_all();
979978
sys.refresh_all();
@@ -1001,7 +1000,7 @@ pub fn getstring(
10011000
}
10021001
}
10031002
skips = leng;
1004-
} else if vec[y] == "os.load_average.fifteen" && uses[0] == "true".to_string() {
1003+
} else if vec[y] == "os.load_average.fifteen" && uses[0] == *"true" {
10051004
use sysinfo::System;
10061005
let mut sys = System::new_all();
10071006
sys.refresh_all();
@@ -1069,7 +1068,7 @@ pub fn getstring(
10691068
}
10701069
}
10711070
skips = leng;
1072-
} else if vec[y] == "os" && uses[0] == "true".to_string() {
1071+
} else if vec[y] == "os" && uses[0] == *"true" {
10731072
imput_s.push_str(env::consts::OS);
10741073
let mut leng = 0;
10751074
let mut n2 = 0;
@@ -1327,7 +1326,7 @@ pub fn eval_eval(
13271326
func_par,
13281327
func_code,
13291328
dev,
1330-
uses.clone(),
1329+
uses,
13311330
0,
13321331
)
13331332
.first()
@@ -1359,7 +1358,7 @@ pub fn exec(
13591358
func_par,
13601359
func_code,
13611360
dev,
1362-
uses.clone(),
1361+
uses,
13631362
0,
13641363
);
13651364
if string.is_empty() {
@@ -1423,7 +1422,7 @@ pub fn round(
14231422
func_par,
14241423
func_code,
14251424
dev,
1426-
uses.clone(),
1425+
uses,
14271426
0,
14281427
)[0]
14291428
.parse::<f32>()
@@ -1453,7 +1452,7 @@ pub fn length(
14531452
func_par,
14541453
func_code,
14551454
dev,
1456-
uses.clone(),
1455+
uses,
14571456
0,
14581457
)
14591458
.join("zzGVgfHaNtPMe7H9RRyx3rWC9JyyZdMkc2v")
@@ -1483,7 +1482,7 @@ pub fn first(
14831482
func_par,
14841483
func_code,
14851484
dev,
1486-
uses.clone(),
1485+
uses,
14871486
0,
14881487
)
14891488
.join("zzGVgfHaNtPMe7H9RRyx3rWC9JyyZdMkc2v")
@@ -1516,7 +1515,7 @@ pub fn last(
15161515
func_par,
15171516
func_code,
15181517
dev,
1519-
uses.clone(),
1518+
uses,
15201519
0,
15211520
)
15221521
.join("zzGVgfHaNtPMe7H9RRyx3rWC9JyyZdMkc2v")
@@ -1549,7 +1548,7 @@ pub fn set_contents(
15491548
func_par,
15501549
func_code,
15511550
dev,
1552-
uses.clone(),
1551+
uses,
15531552
0,
15541553
);
15551554
let file_s = vec[0].to_string();
@@ -1592,7 +1591,7 @@ pub fn get_contents(
15921591
func_par,
15931592
func_code,
15941593
dev,
1595-
uses.clone(),
1594+
uses,
15961595
0,
15971596
)
15981597
.first()
@@ -1630,7 +1629,7 @@ pub fn is_number(
16301629
func_par,
16311630
func_code,
16321631
dev,
1633-
uses.clone(),
1632+
uses,
16341633
0,
16351634
)
16361635
.first()
@@ -1661,7 +1660,7 @@ pub fn replace(
16611660
func_par,
16621661
func_code,
16631662
dev,
1664-
uses.clone(),
1663+
uses,
16651664
0,
16661665
);
16671666
let imput_s = vec[0].to_string();
@@ -1883,7 +1882,7 @@ pub fn math(
18831882
_func_par,
18841883
_func_code,
18851884
false,
1886-
uses.clone(),
1885+
uses,
18871886
3,
18881887
)
18891888
.first()
@@ -1919,7 +1918,7 @@ pub fn trim(
19191918
func_par,
19201919
func_code,
19211920
dev,
1922-
uses.clone(),
1921+
uses,
19231922
0,
19241923
);
19251924
return if getstirng.len() > 1 {
@@ -1956,7 +1955,7 @@ pub fn time_readable(
19561955
func_par,
19571956
func_code,
19581957
dev,
1959-
uses.clone(),
1958+
uses,
19601959
0,
19611960
);
19621961
if !getstirng.is_empty() {
@@ -1994,7 +1993,7 @@ pub fn get_line(x: usize, contents: Vec<String>) -> i32 {
19941993
if line >= run::code_to_add().matches('\n').count() {
19951994
return (line - run::code_to_add().matches('\n').count() + 1) as i32;
19961995
} else {
1997-
return (line + 1) as i32;
1996+
(line + 1) as i32
19981997
}
19991998
}
20001999

@@ -2020,7 +2019,7 @@ pub fn request(
20202019
func_par,
20212020
func_code,
20222021
dev,
2023-
uses.clone(),
2022+
uses,
20242023
0,
20252024
);
20262025
let type_of_request = reply[0].to_string();

0 commit comments

Comments
 (0)