Skip to content

Commit

Permalink
examples: clippy fixes + format
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinKavik committed May 7, 2020
1 parent 9a689c2 commit 5980c1c
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ js-sys = "0.3.39"
pulldown-cmark = "0.7.1"
rand = { version = "0.7.3", features = ["wasm-bindgen", "small_rng"] }
serde = { version = "1.0.106", features = ['derive'] }
serde_json = "1.0.51"
serde_json = "1.0.52"
wasm-bindgen = {version = "0.2.62", features = ["serde-serialize"]}
wasm-bindgen-futures = "0.4.12"
# @TODO: remove once we can use entities without `Debug` in `log!` and `error!` on `stable` Rust.
Expand Down
2 changes: 1 addition & 1 deletion examples/bunnies/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ use awsm_web::webgl::{
WebGlTextureSource,
};
use awsm_web::window::get_window_size;
use seed::web_sys::{HtmlCanvasElement, HtmlImageElement};
use seed::{prelude::*, *};
use shipyard::{NonSendSync, UniqueView, UniqueViewMut, World};
use web_sys::{HtmlCanvasElement, HtmlImageElement};

mod components;
mod config;
Expand Down
2 changes: 1 addition & 1 deletion examples/bunnies/src/scene_renderer.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::geometry::*;
use crate::web_sys::HtmlImageElement;
use nalgebra::{Matrix4, Vector3};
use seed::web_sys::HtmlImageElement;

use awsm_web::webgl::{
AttributeOptions, BeginMode, BlendFactor, BufferData, BufferMask, BufferTarget, BufferUsage,
Expand Down
1 change: 0 additions & 1 deletion examples/canvas/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ fn init(_: Url, orders: &mut impl Orders<Msg>) -> Model {
Model::default()
}


// ------ ------
// Model
// ------ ------
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_elements/src/code_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use seed::{prelude::*, *};
pub fn view<Ms: 'static>(lang: &str, code: &str) -> Node<Ms> {
custom![
Tag::from("code-block"),
attrs!{
attrs! {
At::from("lang") => lang,
At::from("code") => code,
}
]
}
}
4 changes: 2 additions & 2 deletions examples/custom_elements/src/feather_icon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use seed::{prelude::*, *};
pub fn view<Ms: 'static>(icon: &str, width: Option<u32>, height: Option<u32>) -> Node<Ms> {
custom![
Tag::from("feather-icon"),
attrs!{
attrs! {
At::from("icon") => icon,
At::Width => if let Some(width) = width { AtValue::Some(width.to_string()) } else { AtValue::Ignored },
At::Height => if let Some(height) = height { AtValue::Some(height.to_string()) } else { AtValue::Ignored },
}
]
}
}
7 changes: 2 additions & 5 deletions examples/custom_elements/src/math_tex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@ use seed::{prelude::*, *};
// ------ ------

pub fn view<Ms: 'static>(expression: &str) -> Node<Ms> {
custom![
Tag::from("math-tex"),
expression,
]
}
custom![Tag::from("math-tex"), expression,]
}
7 changes: 2 additions & 5 deletions examples/server_integration/server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use actix::prelude::*;
use actix_files::{Files, NamedFile};
use actix_multipart::Multipart;
use actix_web::{get, post, web, App, HttpServer, Result};
use futures::stream::StreamExt;
use std::fmt::Write;
use std::time;
use futures::stream::StreamExt;

mod count_actor;
use count_actor::{CountActor, MsgIncrement};
Expand All @@ -22,11 +22,8 @@ async fn send_message(
}))
}


#[get("delayed-response/{delay}")]
async fn delayed_response(
delay: web::Path<u64>,
) -> String {
async fn delayed_response(delay: web::Path<u64>) -> String {
futures_timer::Delay::new(time::Duration::from_millis(*delay)).await;
format!("Delay was set to {}ms.", delay)
}
Expand Down
2 changes: 1 addition & 1 deletion examples/window_events/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
} else {
model.event_streams.clear();
}
},
}
Msg::MouseMoved(ev) => {
model.point = Point {
x: ev.client_x(),
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ pub mod prelude {
},
};
pub use indexmap::IndexMap; // for attrs and style to work.
pub use wasm_bindgen::{self, JsCast, prelude::*};
pub use web_sys;
pub use js_sys;
pub use wasm_bindgen::{self, prelude::*, JsCast};
pub use web_sys;
}

#[cfg(test)]
Expand Down

0 comments on commit 5980c1c

Please sign in to comment.