Skip to content

Commit b1c12fa

Browse files
author
梶塚太智
committed
Fixed wrong error value
1 parent 0a6c507 commit b1c12fa

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/main.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use clap::{App, Arg};
2+
use clipboard::{ClipboardContext, ClipboardProvider};
23
use rand::seq::SliceRandom;
34
use regex::Regex;
45
use rodio::{OutputStream, Sink, Source};
56
use std::collections::HashMap;
67
use std::env;
7-
use clipboard::{ClipboardContext, ClipboardProvider};
88
use std::fs::{self, File};
99
use std::io::{self, Error, Read, Write};
1010
use std::path::Path;
@@ -17,7 +17,7 @@ mod test;
1717

1818
fn main() {
1919
let matches = App::new("Stack")
20-
.version("1.11")
20+
.version("1.12")
2121
.author("Stack Programming Community")
2222
.about("The powerful script language designed with a stack oriented approach for efficient execution. ")
2323
.arg(Arg::new("script")
@@ -1406,14 +1406,14 @@ impl Executor {
14061406
ctx = i
14071407
} else {
14081408
self.stack.push(Type::Error("set-clipboard".to_string()));
1409-
return
1409+
return;
14101410
};
1411-
1411+
14121412
let value = self.pop_stack().get_string();
14131413
if ctx.set_contents(value.clone()).is_ok() {
14141414
self.stack.push(Type::String(value));
14151415
} else {
1416-
self.stack.push(Type::Error("get-clipboard".to_string()))
1416+
self.stack.push(Type::Error("set-clipboard".to_string()))
14171417
};
14181418
}
14191419

@@ -1423,11 +1423,10 @@ impl Executor {
14231423
if let Ok(i) = ClipboardProvider::new() {
14241424
ctx = i
14251425
} else {
1426-
self.stack.push(Type::Error("set-clipboard".to_string()));
1427-
return
1426+
self.stack.push(Type::Error("get-clipboard".to_string()));
1427+
return;
14281428
};
14291429

1430-
14311430
if let Ok(contents) = ctx.get_contents() {
14321431
self.stack.push(Type::String(contents));
14331432
} else {

0 commit comments

Comments
 (0)