Merge pull request #294 from martinfrances107/workflow_cargo_fmt

Policy change ( part 2 ) Added rule of enforcing cargo fmt.
This commit is contained in:
Greg Johnston
2023-01-10 09:37:38 -05:00
committed by GitHub
2 changed files with 7 additions and 4 deletions

View File

@@ -28,6 +28,7 @@ jobs:
with:
toolchain: ${{ matrix.rust }}
override: true
components: rustfmt
- name: Setup cargo-make
uses: davidB/rust-cargo-make@v1
@@ -35,6 +36,9 @@ jobs:
- name: Cargo generate-lockfile
run: cargo generate-lockfile
- name: Run Rustfmt
run: cargo fmt -- --check
- name: Cargo cache
uses: actions/cache@v3
with:

View File

@@ -287,11 +287,10 @@ where
// Otherwise we need to add _bg because wasm_pack always does. This is not the same as options.output_name, which is set regardless
let output_name = &options.output_name;
let mut wasm_output_name = output_name.clone();
if std::env::var("LEPTOS_OUTPUT_NAME").is_err() {
wasm_output_name.push_str("_bg");
}
let site_ip = &options.site_address.ip().to_string();
let reload_port = options.reload_port;
let pkg_path = &options.site_pkg_dir;
@@ -346,7 +345,7 @@ where
format!("{head}</head><body>").into()
});
let mut stream = Box::pin(futures::stream::once(async move { head.clone() })
let mut stream = Box::pin(futures::stream::once(async move { head.clone() })
.chain(stream)
.chain(futures::stream::once(async move {
runtime.dispose();
@@ -363,7 +362,7 @@ where
let (status, mut headers) = (res_options.status, res_options.headers.clone());
let status = status.unwrap_or_default();
let complete_stream =
futures::stream::iter([first_chunk.unwrap(), second_chunk.unwrap(), third_chunk.unwrap()])
.chain(stream);