From f0131f8c5f58f7547a1697c2715f4b86247eb561 Mon Sep 17 00:00:00 2001 From: daichi Date: Sun, 25 Oct 2020 16:44:51 +0900 Subject: [PATCH 1/6] fmt --- art/omikuji/1.txt | 37 +++++++++++++++++++++++++++++++++++++ art/omikuji/2.txt | 38 ++++++++++++++++++++++++++++++++++++++ art/omikuji/3.txt | 38 ++++++++++++++++++++++++++++++++++++++ art/omikuji/4.txt | 38 ++++++++++++++++++++++++++++++++++++++ art/omikuji/5.txt | 38 ++++++++++++++++++++++++++++++++++++++ art/omikuji/6.txt | 39 +++++++++++++++++++++++++++++++++++++++ src/main.rs | 9 ++++++++- 7 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 art/omikuji/1.txt create mode 100644 art/omikuji/2.txt create mode 100644 art/omikuji/3.txt create mode 100644 art/omikuji/4.txt create mode 100644 art/omikuji/5.txt create mode 100644 art/omikuji/6.txt diff --git a/art/omikuji/1.txt b/art/omikuji/1.txt new file mode 100644 index 00000000..edfee525 --- /dev/null +++ b/art/omikuji/1.txt @@ -0,0 +1,37 @@ + + + + + + .gggggggggggggggggggggggggggggggggggggp + ,#pbppppppbppppppbbbbpppppppbppbpppbpW# + .#pppppppppppppppppppppppppppppppppppW# + ` ` ` ` ` ` ` ` ` ,#ppb` (bppW# ` ` ` ` ` ` ` ` + ,#ppb. .&aJ, (ppbW# + .#ppp_ .4bppL (pppW# + .#ppb_ ,bppWdXkkAJ. (bppW# ` + ` .#ppp_ ` ..Jdbppbpbbbpbppbn (ppbW# ` + ` ` ` ` ` ` ` ` ,#ppp_ jbpppbbppbppppppWWbppb! (pppW# ` ` ` ` ` ` + ,#ppb_ (Wpppppbppbpbk. _! (bppW# ` + .#ppp_ ?77Xbppbppbbn. (ppbW# ` + ` ` .#bbb_ JbpbpP7pppbbo. (pppW# ` ` + .#ppp_ .XbppbK` (Wbppppa. (bbpW# + .#bpb_ .JbbppbK` 4pppbbbn (bppW# + .#ppp_ .Wbbbpbpf` ?Wpppppb (bppW# + .#ppp` ?WpbpW= Tpbpp% (ppbW# + .#ppb ?` ~ (pppW# + .#ppp .JJ., (pbpW# + .#pbp. .4pbbh...... (bppW# + .#ppb. ......JdXppbbbbbpbppWa. (pppW# + .#ppb. 4bpppbbbpbppWY""777TUY! (bppW# + .#ppp` _??!` ,pbpW..(J... (ppbW# + .#ppb_ J+J&dWpppbppbbpbppbh (bppW# + .#ppp_ (4WppbpUY""71--. ??! (bppW# + .#ppp_ .pbY .(dppbpppW+ (bppW# + .#ppb_ .bppbpppWY=` XpbW. (ppbW# + .#ppp_ ,ppR ~! .XppbY (pppW# + .#pbp_ .Wppo..JdkWbpppp+ (bppW# + .#ppp_ .4pppbWUUYYYTWpp} (pbpW# + .#ppb-...........................JpppW# + .#ppppppppppppppbbbbbppppppppppppppbpW# + .NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN# \ No newline at end of file diff --git a/art/omikuji/2.txt b/art/omikuji/2.txt new file mode 100644 index 00000000..fd74d0ab --- /dev/null +++ b/art/omikuji/2.txt @@ -0,0 +1,38 @@ + + + + + + .gggggggggggggggggggggggggggggggggggggp + ,#pbppppppbppppppbbbbpppppppbppbpppbpW# + .#pppppppppppppppppppppppppppppppppppW# + ` ` ` ` ` ` ` ` ` ,#ppb` (bppW# ` ` ` ` ` ` ` ` + ,#ppb. (ppbW# + .#ppp_ (pppW# + .#ppb_ (bppW# ` + ` .#ppp_ (ppbW# ` + ` ` ` ` ` ` ` ` ,#ppp_ ` ` ` ` ` ` ` (bppW# ` ` ` ` ` ` + ,#ppb_ (bppW# ` + .#ppp_ ... (ppbW# ` + ` ` .#bpp_ ?bbbW, ` (bppW# ` ` + .#ppb_ ` ...dppppbbbkkkk+, (pppW# + .#bpp_ .bbbbbbbbpppppbWUUUWbpW` (bppW# + .#ppb_ 7TTT""74pbbP .... (bppW# + .#pbp` .....(+XbppbbbbbbbW, (bppW# + .#ppb 4ppbpbppbWUY"""""TY= (ppbW# + .#ppb .Wpf' ..dppppk-. (bppW# + .#ppb. .ppWgWppppY=`(ppbl (pppW# + .#ppb. JppP7""7` .Jpppf (bppW# + .#ppb. ,bpW. ....(JbpbW^ (ppbW# + .#ppp` 7ppppppbbpbbpppW. (pppW# + .#ppb_ ??!` _! (bppW# + .#ppp_ (bbpW# + .#ppp_ (pppW# + .#ppb_ (ppbW# + .#ppp_ (pppW# + .#pbp_ (ppbW# + .#ppp_ (pppW# + .#ppb-...........................JpbpW# + .#pppppppppppppppbbbpbpppppppppppppppW# + .NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN# + diff --git a/art/omikuji/3.txt b/art/omikuji/3.txt new file mode 100644 index 00000000..e60a5f78 --- /dev/null +++ b/art/omikuji/3.txt @@ -0,0 +1,38 @@ + + + + + + .gggggggggggggggggggggggggggggggggggggp + ,#pbppppppbppppppbbbbpppppppbppbpppbpW# + .#pppppppppppppppppppppppppppppppppppW# + ` ` ` ` ` ` ` ` ` ,#ppb` .... (bppW# ` ` ` ` ` ` ` ` + ,#ppb. 7WpbW, (ppbW# + .#ppp_ ,bbbW+wkkaJ. (pppW# + .#ppb_ .Xbn,...+XppppbbWY"pppn. (pppW# ` + ` .#ppp_ TbbpppbbbpbpW=` .ppbbR (bppW# ` + ` ` ` ` ` ` ` ` ,#ppp_ bpp=TTY4ppbW .XbpbbP (ppbW# ` ` ` ` ` ` + ,#ppb_ bpb} ,bppp .XppbW= (pppW# ` + .#ppp_ bbp[ ,bbpbbbppbpp+ (pppW# ` + ` ` .#bbb_ 4pbbbbpbppbpbpbppbpbb (bbpW# ` ` + .#ppp_ 7Wpppbppbpp>` _7"' (pppW# + .#bpb_ ,ppbp_ (bppW# + .#ppp_ ,ppbb: (bppW# + .#ppp` 7UY= (bppW# + .#ppb ... (ppbW# + .#ppp .Wbbpo (bppW# + .#pbp. ...bpbpbbbbbbka, (bppW# + .#ppb. dWbbbbbpppppbpbWUUUpbb] (ppbW# + .#ppb. ?TYYY""7pbpp_ ... (pppW# + .#ppp` ......(ubpppppbpppWa. (pppW# + .#ppb_ ?WbbpppbpbWUY""""TUY' (bppW# + .#ppp_ gbW= ..JdpppWa, (bbpW# + .#ppp_ JbpndppppKY!_4pph. (pppW# + .#ppb_ .bbp?TY"^ .pppp' (ppbW# + .#ppb_ Wpp; .....WpppY` (pppW# + .#ppp_ ,Wppppbbbpbpbbpb[ (ppbW# + .#ppb_ ?77!` _?` (pppW# + .#ppp-...........................JpbpW# + .#pppppppppppppbbbpbbppppppppppppppppW# + .NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN# + diff --git a/art/omikuji/4.txt b/art/omikuji/4.txt new file mode 100644 index 00000000..e5e03566 --- /dev/null +++ b/art/omikuji/4.txt @@ -0,0 +1,38 @@ + + + + + + .gggggggggggggggggggggggggggggggggggggp + ,#pbppppppbppppppbbbbpppppppbppbpppbpW# + .#pppppppppppppppppppppppppppppppppppW# + ` ` ` ` ` ` ` ` ` ,#ppb` (bppW# ` ` ` ` ` ` ` ` + ,#ppb. (AA&, (ppbW# + .#ppp_ ,Wppb[ ... (pppW# + .#ppb_ ... Xppb] 7bbpn (bppW# ` + ` .#ppp_ ,WpbW. Xbpp] WpbL (ppbW# ` + ` ` ` ` ` ` ` ` ,#ppp_ .pbb: Xbpp] XppW (pppW# ` ` ` ` ` ` + ,#ppb_ dppb Xbpb] Xpbb; (pppW# ` + .#ppp_ bbpW Xbpb] Xbpp] (ppbW# ` + ` ` .#bpp_ .bppW Xbpp] Wbppb (bppW# ` ` + .#ppb_ .ppbpbn..Xppb] bbpbR (pppW# + .#bpp_ .ppbW?Wpbbppb$ Wppbf (bppW# + .#ppb_ WppK 4ppbppb (bpp\ (bppW# + .#pbp` 7"^ ?ppbp% (ppbW# + .#ppb _?` (pppW# + .#ppb .ea+, (bppW# + .#ppb. 4ppph....... (ppbW# + .#ppb. .....JdXbpppppppppppbn. (pppW# + .#ppb. 4ppppbbpbbbpW""7?!?"T"` (pppW# + .#ppp` ``` ,bpbW(J&&+.. (ppbW# + .#ppb_ gAgwpbbppbpbpppppppW (bppW# + .#ppp_ .7UWpbWY""7i(... !` (bppW# + .#ppp_ .bp=..+ppppVWbba. (ppbW# + .#ppb_ .bppbbppKY^ XbbW. (pppW# + .#ppp_ ,bpR .bppp= (pppW# + .#pbp_ Wbpn.JdXbbbbpbp+ (ppbW# + .#ppp_ TpbbWUYY"""TTWW> (pppW# + .#ppb-...........................JpbpW# + .#ppppppppppppppbbbbbppppppppppppppppW# + .NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN# + diff --git a/art/omikuji/5.txt b/art/omikuji/5.txt new file mode 100644 index 00000000..6b1c932d --- /dev/null +++ b/art/omikuji/5.txt @@ -0,0 +1,38 @@ + + + + + + .gggggggggggggggggggggggggggggggggggggp + ,#pbppppppbppppppbbbbpppppppbppbpppbpW# + .#pppppppppppppppppppppppppppppppppppW# + ` ` ` ` ` ` ` ` ` ,#ppb` (bppW# ` ` ` ` ` ` ` ` + ,#ppb. .Wbbk. (ppbW# + .#ppp_ 7ppbbneAkAa+.. (pppW# + .#ppb_ .....+dbppppppbbbpbbbbk. (bppW# ` + ` .#ppp_ 4ppbbbppbbpbpY!``_?7""" (bppW# ` + ` ` ` ` ` ` ` ` ,#ppp_ ?777!` Xppb[..... (ppbW# ` ` ` ` ` ` + ,#ppb_ 4W+..Wppppppppbbn (pppW# ` + .#ppp_ .WpppppbpbppWWppbWpW\ (pppW# ` + ` ` .#bbb_ .zppWY"Wbbp[ WppW, (bbpW# ` ` + .#ppp_ .bpbP Xppb] ,bpbbl (pppW# + .#bpb_ .ppbb+..Xbppb zbpbb[ (bppW# + .#ppp_ Jbppp\.Tppbppp. .ppppR (bppW# + .#ppp` ?TY' 7Wbbf ,4UY! (bppW# + .#ppb (ppbW# + .#ppp dpka, (bppW# + .#pbp. .bbbba.JJJ(.. (pppW# + .#ppb. ...(+dXpbpppbbbpppppppo (ppbW# + .#ppb. .4pbpbppWbpppY?!` _?"' (bppW# + .#ppp` .pbppkdXWkAJ, (pppW# + .#ppb_ ,bpbbbbppbpbppppbbpb] (bbpW# + .#ppp_ _"4pbWY"?~..+&-, (bppW# + .#ppp_ .Wpf..dpppbUTWpW& (pppW# + .#ppb_ dppWpppUY! .pbbr (ppbW# + .#ppp_ Wpp) .XppbY` (pppW# + .#pbp_ ,bppAdXpbppbpbpk, (ppbW# + .#ppp_ .TWUUY"""7777TU= (pppW# + .#ppb-...........................JpppW# + .#pppppppppppppbbbbbbpppppppppppppbppW# + .NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN# + diff --git a/art/omikuji/6.txt b/art/omikuji/6.txt new file mode 100644 index 00000000..f9648b06 --- /dev/null +++ b/art/omikuji/6.txt @@ -0,0 +1,39 @@ + + + + + + .gggggggggggggggggggggggggggggggggggggp + ,#pbppppppbppppppbbbbpppppppbppbpppbpW# + .#pppppppppppppppppppppppppppppppppppW# + ` ` ` ` ` ` ` ` ` ,#ppb` (bppW# ` ` ` ` ` ` ` ` + ,#ppb. (ppbW# + .#ppp_ (pppW# + .#ppb_ (bppW# ` + ` .#ppp_ (ppbW# ` + ` ` ` ` ` ` ` ` ,#ppp_ ` ` ` ` ` ` ` (bppW# ` ` ` ` ` ` + ,#ppb_ (bppW# ` + .#ppp_ (bn,.(.. (ppbW# ` + ` ` .#bpp_ 4kWa. dbpR4bbh (pppW# ` ` + .#ppb_ .bbbn... `.dbpp%Jppb_ (bbpW# + .#bpp_ .pppUbbbbn..WpbpP Jbpp_ (bppW# + .#ppb_ .ppb} (4bbbpppp= Jppp_ (pppW# + .#pbp` .ppb) .ppppbp&. Jbpp_ (pbpW# + .#ppb .bpp) .Jppbpbppbp,Jppp~ (bppW# + .#ppb ,ppbndppbpW=,Wpppppbpp~ (pbpW# + .#ppb. ,bppWbppbY` 7WpbWpbp_ (pppW# + .#ppb. ,pbp) ?! ......dpbb: (bppW# + .#ppb. .ppbWAwWbbbppppppppppp! (ppbW# + .#ppp` .TWppWUUYY"""77777Wpf (pppW# + .#ppb_ (bppW# + .#ppp_ (bbpW# + .#ppp_ (pppW# + .#ppb_ (ppbW# + .#ppp_ (pppW# + .#pbp_ (ppbW# + .#ppp_ (pppW# + .#ppb-...........................JpbpW# + .#pppppppppppppppbbbpbpppppppppppppppW# + .NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN# + + ` ` \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 96239b23..c45012ad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ extern crate serde; use clap::{App, AppSettings, Arg}; use evtx::EvtxParser; use quick_xml::de::DeError; -use std::{path::PathBuf, process}; +use std::{fs, path::PathBuf, process}; use yamato_event_analyzer::detections::detection; use yamato_event_analyzer::toml; @@ -32,6 +32,7 @@ fn build_app() -> clap::App<'static, 'static> { .arg(Arg::from_usage("-d --directory 'event log files directory'")) .arg(Arg::from_usage("-s --statistics 'event statistics'")) .arg(Arg::from_usage("-u --update 'signature update'")) + .arg(Arg::from_usage("-o --omikuji 'output with omikuji'")) .arg(Arg::from_usage("--credits 'Zachary Mathis, Akira Nishikawa'")) } @@ -59,3 +60,9 @@ fn parse_file(filepath: &str) { let mut detection = detection::Detection::new(); &detection.start(parser); } + +fn output_with_omikuji(severity: &str) { + let fp = &format!("art/omikuji/{}.txt", severity); + let content = fs::read_to_string(fp).unwrap(); + println!("{}", content); +} From c03ca73f6ceb88c449610d152339d6f4a5ffcd3c Mon Sep 17 00:00:00 2001 From: daichi Date: Sun, 25 Oct 2020 23:50:49 +0900 Subject: [PATCH 2/6] fix --- art/omikuji/{3.txt => CHUKICHI.txt} | 0 art/omikuji/{1.txt => DAIKICHI.txt} | 0 art/omikuji/{2.txt => KICHI.txt} | 0 art/omikuji/{6.txt => KYOU.txt} | 0 art/omikuji/{4.txt => SHOUKICHI.txt} | 0 art/omikuji/{5.txt => SUEKICHI.txt} | 0 src/lib.rs | 1 + src/main.rs | 7 ++++--- src/omikuji.rs | 22 ++++++++++++++++++++++ 9 files changed, 27 insertions(+), 3 deletions(-) rename art/omikuji/{3.txt => CHUKICHI.txt} (100%) rename art/omikuji/{1.txt => DAIKICHI.txt} (100%) rename art/omikuji/{2.txt => KICHI.txt} (100%) rename art/omikuji/{6.txt => KYOU.txt} (100%) rename art/omikuji/{4.txt => SHOUKICHI.txt} (100%) rename art/omikuji/{5.txt => SUEKICHI.txt} (100%) create mode 100644 src/omikuji.rs diff --git a/art/omikuji/3.txt b/art/omikuji/CHUKICHI.txt similarity index 100% rename from art/omikuji/3.txt rename to art/omikuji/CHUKICHI.txt diff --git a/art/omikuji/1.txt b/art/omikuji/DAIKICHI.txt similarity index 100% rename from art/omikuji/1.txt rename to art/omikuji/DAIKICHI.txt diff --git a/art/omikuji/2.txt b/art/omikuji/KICHI.txt similarity index 100% rename from art/omikuji/2.txt rename to art/omikuji/KICHI.txt diff --git a/art/omikuji/6.txt b/art/omikuji/KYOU.txt similarity index 100% rename from art/omikuji/6.txt rename to art/omikuji/KYOU.txt diff --git a/art/omikuji/4.txt b/art/omikuji/SHOUKICHI.txt similarity index 100% rename from art/omikuji/4.txt rename to art/omikuji/SHOUKICHI.txt diff --git a/art/omikuji/5.txt b/art/omikuji/SUEKICHI.txt similarity index 100% rename from art/omikuji/5.txt rename to art/omikuji/SUEKICHI.txt diff --git a/src/lib.rs b/src/lib.rs index 72434c62..b1dd090e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ pub mod detections; pub mod models; +pub mod omikuji; pub mod toml; diff --git a/src/main.rs b/src/main.rs index c45012ad..946572f5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,6 +7,7 @@ use quick_xml::de::DeError; use std::{fs, path::PathBuf, process}; use yamato_event_analyzer::detections::detection; use yamato_event_analyzer::toml; +use yamato_event_analyzer::omikuji::Omikuji; fn build_app() -> clap::App<'static, 'static> { let program = std::env::args() @@ -43,7 +44,7 @@ fn main() -> Result<(), DeError> { if let Some(filepath) = filepath { parse_file(filepath); } - + output_with_omikuji(Omikuji::DAIKICHI); Ok(()) } @@ -61,8 +62,8 @@ fn parse_file(filepath: &str) { &detection.start(parser); } -fn output_with_omikuji(severity: &str) { - let fp = &format!("art/omikuji/{}.txt", severity); +fn output_with_omikuji(omikuji: Omikuji) { + let fp = &format!("art/omikuji/{}", omikuji.get_file_name()); let content = fs::read_to_string(fp).unwrap(); println!("{}", content); } diff --git a/src/omikuji.rs b/src/omikuji.rs new file mode 100644 index 00000000..e72f94af --- /dev/null +++ b/src/omikuji.rs @@ -0,0 +1,22 @@ +pub enum Omikuji { + DAIKICHI, + KICHI, + CHUKICHI, + SHOUKICHI, + SUEKICHI, + KYOU, +} + +impl Omikuji { + pub fn get_file_name(&self) -> String { + let file_name = match *self { + Omikuji::DAIKICHI => "DAIKICHI.txt", + Omikuji::KICHI => "KICHI.txt", + Omikuji::CHUKICHI => "CHUKICHI.txt", + Omikuji::SHOUKICHI => "SHOUKICHI.txt", + Omikuji::SUEKICHI => "SUEKICHI.txt", + Omikuji::KYOU => "KYOU.txt", + }; + file_name.to_string() + } +} \ No newline at end of file From 46aa50a597d314d3844f53c619d4627b86bfd5ca Mon Sep 17 00:00:00 2001 From: daichi Date: Sun, 25 Oct 2020 23:51:59 +0900 Subject: [PATCH 3/6] fmt --- src/main.rs | 2 +- src/omikuji.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 946572f5..67ed0886 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,8 +6,8 @@ use evtx::EvtxParser; use quick_xml::de::DeError; use std::{fs, path::PathBuf, process}; use yamato_event_analyzer::detections::detection; -use yamato_event_analyzer::toml; use yamato_event_analyzer::omikuji::Omikuji; +use yamato_event_analyzer::toml; fn build_app() -> clap::App<'static, 'static> { let program = std::env::args() diff --git a/src/omikuji.rs b/src/omikuji.rs index e72f94af..1604a292 100644 --- a/src/omikuji.rs +++ b/src/omikuji.rs @@ -19,4 +19,4 @@ impl Omikuji { }; file_name.to_string() } -} \ No newline at end of file +} From 369c7c1e551ecbbe8cd92bc35b586d998612d82b Mon Sep 17 00:00:00 2001 From: daichi Date: Mon, 26 Oct 2020 22:28:39 +0900 Subject: [PATCH 4/6] add test --- src/main.rs | 4 ++-- src/omikuji.rs | 30 +++++++++++++++++++----------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 67ed0886..fe8ffba4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -44,7 +44,7 @@ fn main() -> Result<(), DeError> { if let Some(filepath) = filepath { parse_file(filepath); } - output_with_omikuji(Omikuji::DAIKICHI); + Ok(()) } @@ -63,7 +63,7 @@ fn parse_file(filepath: &str) { } fn output_with_omikuji(omikuji: Omikuji) { - let fp = &format!("art/omikuji/{}", omikuji.get_file_name()); + let fp = &format!("art/omikuji/{}", omikuji); let content = fs::read_to_string(fp).unwrap(); println!("{}", content); } diff --git a/src/omikuji.rs b/src/omikuji.rs index 1604a292..0c14490f 100644 --- a/src/omikuji.rs +++ b/src/omikuji.rs @@ -1,3 +1,5 @@ +use std::fmt; + pub enum Omikuji { DAIKICHI, KICHI, @@ -7,16 +9,22 @@ pub enum Omikuji { KYOU, } -impl Omikuji { - pub fn get_file_name(&self) -> String { - let file_name = match *self { - Omikuji::DAIKICHI => "DAIKICHI.txt", - Omikuji::KICHI => "KICHI.txt", - Omikuji::CHUKICHI => "CHUKICHI.txt", - Omikuji::SHOUKICHI => "SHOUKICHI.txt", - Omikuji::SUEKICHI => "SUEKICHI.txt", - Omikuji::KYOU => "KYOU.txt", - }; - file_name.to_string() +impl fmt::Display for Omikuji { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match *self { + Omikuji::DAIKICHI => write!(f, "DAIKICHI.txt"), + Omikuji::KICHI => write!(f, "KICHI.txt"), + Omikuji::CHUKICHI => write!(f, "CHUKICHI.txt"), + Omikuji::SHOUKICHI => write!(f, "SHOUKICHI.txt"), + Omikuji::SUEKICHI => write!(f, "SUEKICHI.txt"), + Omikuji::KYOU => write!(f, "KYOU.txt"), + } } } + + + +#[test] +fn test_display() { + assert_eq!("DAIKICHI.txt", Omikuji::DAIKICHI.to_string()); +} From 93f81f751d4558b7807f11711885553df04f2b47 Mon Sep 17 00:00:00 2001 From: daichi Date: Mon, 26 Oct 2020 22:30:27 +0900 Subject: [PATCH 5/6] fix test --- src/omikuji.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/omikuji.rs b/src/omikuji.rs index 0c14490f..4093114d 100644 --- a/src/omikuji.rs +++ b/src/omikuji.rs @@ -26,5 +26,5 @@ impl fmt::Display for Omikuji { #[test] fn test_display() { - assert_eq!("DAIKICHI.txt", Omikuji::DAIKICHI.to_string()); + assert_eq!(Omikuji::DAIKICHI.to_string(), "DAIKICHI.txt",); } From f874295a7ab10b14c819563e642253cd89e1d2e4 Mon Sep 17 00:00:00 2001 From: daichi Date: Mon, 26 Oct 2020 22:31:21 +0900 Subject: [PATCH 6/6] fmt --- src/omikuji.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/omikuji.rs b/src/omikuji.rs index 4093114d..7b85df14 100644 --- a/src/omikuji.rs +++ b/src/omikuji.rs @@ -22,8 +22,6 @@ impl fmt::Display for Omikuji { } } - - #[test] fn test_display() { assert_eq!(Omikuji::DAIKICHI.to_string(), "DAIKICHI.txt",);