summaryrefslogtreecommitdiffstats
path: root/examples/tinydb.rs
diff options
context:
space:
mode:
authorArtem Vorotnikov <artem@vorotnikov.me>2019-12-14 09:01:47 +0300
committerCarl Lerche <me@carllerche.com>2019-12-13 22:01:47 -0800
commitd593c5b051f07bde5117122216a356632986b6dd (patch)
tree87df3c4dd3a4cda23ae1125e8b78358804385edb /examples/tinydb.rs
parent91ecb4b4c2ec202b6754ccb5fb266a84fe3a7327 (diff)
chore: remove benches and fix/work around clippy lints (#1952)
Diffstat (limited to 'examples/tinydb.rs')
-rw-r--r--examples/tinydb.rs19
1 files changed, 9 insertions, 10 deletions
diff --git a/examples/tinydb.rs b/examples/tinydb.rs
index 3fc88f6b..cf867a0a 100644
--- a/examples/tinydb.rs
+++ b/examples/tinydb.rs
@@ -84,7 +84,9 @@ enum Response {
async fn main() -> Result<(), Box<dyn Error>> {
// Parse the address we're going to run this server on
// and set up our TCP listener to accept connections.
- let addr = env::args().nth(1).unwrap_or("127.0.0.1:8080".to_string());
+ let addr = env::args()
+ .nth(1)
+ .unwrap_or_else(|| "127.0.0.1:8080".to_string());
let mut listener = TcpListener::bind(&addr).await?;
println!("Listening on: {}", addr);
@@ -175,15 +177,12 @@ fn handle_request(line: &str, db: &Arc<Database>) -> Response {
impl Request {
fn parse(input: &str) -> Result<Request, String> {
- let mut parts = input.splitn(3, " ");
+ let mut parts = input.splitn(3, ' ');
match parts.next() {
Some("GET") => {
- let key = match parts.next() {
- Some(key) => key,
- None => return Err(format!("GET must be followed by a key")),
- };
+ let key = parts.next().ok_or("GET must be followed by a key")?;
if parts.next().is_some() {
- return Err(format!("GET's key must not be followed by anything"));
+ return Err("GET's key must not be followed by anything".into());
}
Ok(Request::Get {
key: key.to_string(),
@@ -192,11 +191,11 @@ impl Request {
Some("SET") => {
let key = match parts.next() {
Some(key) => key,
- None => return Err(format!("SET must be followed by a key")),
+ None => return Err("SET must be followed by a key".into()),
};
let value = match parts.next() {
Some(value) => value,
- None => return Err(format!("SET needs a value")),
+ None => return Err("SET needs a value".into()),
};
Ok(Request::Set {
key: key.to_string(),
@@ -204,7 +203,7 @@ impl Request {
})
}
Some(cmd) => Err(format!("unknown command: {}", cmd)),
- None => Err(format!("empty input")),
+ None => Err("empty input".into()),
}
}
}