-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from LoungeCPP/наб/message
Implement server-side messages
- Loading branch information
Showing
8 changed files
with
1,927 additions
and
1 deletion.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,12 @@ readme = "README.md" | |
keywords = ["game", "lounge", "server"] | ||
license = "MIT" | ||
version = "0.1.0" | ||
authors = ["nabijaczleweli <[email protected]>"] | ||
authors = ["nabijaczleweli <[email protected]>", | ||
"Cat Plus Plus <[email protected]>"] | ||
|
||
[dependencies] | ||
serde = "0.7" | ||
serde_json = "0.7" | ||
|
||
[dev-dependencies] | ||
rand = "0.3" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
1. Install Rust 1.7 (multirust recommended). | ||
2. Run `cargo run`. By default server listens on 127.0.0.1:8080. | ||
|
||
If you're not in the authors section in Cargo.toml, add yourself there if you commit any code. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
use serde_json; | ||
|
||
#[derive(Debug)] | ||
pub enum MessageError { | ||
JsonError(serde_json::Error), | ||
PropertyMissing(String), | ||
ExtraneousProperty(String), | ||
BadType(String), | ||
} | ||
|
||
impl From<serde_json::Error> for MessageError { | ||
fn from(sje: serde_json::Error) -> Self { | ||
MessageError::JsonError(sje) | ||
} | ||
} |
Oops, something went wrong.