Index: .github/workflows/rust-clippy.yml ================================================================== --- .github/workflows/rust-clippy.yml +++ .github/workflows/rust-clippy.yml @@ -1,25 +1,29 @@ name: rust-ci -on: push +on: + push: + branches: [ master, release ] + pull_request: # sccache enable for rust/C builds env: SCCACHE_GHA_ENABLED: "true" RUSTC_WRAPPER: "sccache" jobs: rust-ci-run: - name: Run rust-clippy analyze and testing + name: Run rust-clippy analyzing and tests runs-on: ubuntu-latest + if: github.event_name == 'push' || (github.head_ref != 'master' && github.head_ref != 'release') permissions: contents: read steps: # SETUP - uses: actions/checkout@v6 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - - uses: mozilla-actions/sccache-action@v0.0.9 + - uses: mozilla-actions/sccache-action@v0.0.10 # TESTS - name: Run tests run: cargo test --all-targets --all-features Index: Cargo.lock ================================================================== --- Cargo.lock +++ Cargo.lock @@ -2032,11 +2032,11 @@ "quick-xml", ] [[package]] name = "rsstg" -version = "0.5.4" +version = "0.5.6" dependencies = [ "async-compat", "atom_syndication", "chrono", "config", @@ -2082,13 +2082,13 @@ "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.38" +version = "0.23.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" +checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e" dependencies = [ "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", @@ -2146,13 +2146,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.12" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -2996,13 +2996,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "unicase" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3603,13 +3603,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" dependencies = [ "memchr", ] [[package]] Index: Cargo.toml ================================================================== --- Cargo.toml +++ Cargo.toml @@ -1,8 +1,8 @@ [package] name = "rsstg" -version = "0.5.4" +version = "0.5.6" authors = ["arcade"] edition = "2021" [dependencies] async-compat = "0.2.5" Index: src/core.rs ================================================================== --- src/core.rs +++ src/core.rs @@ -123,10 +123,12 @@ pub db: Db, running: Arc>>, http_client: reqwest::Client, } +// XXX Right now that part is unfinished and I guess I need to finish menu first +#[allow(unused)] pub struct Post { uri: String, title: String, authors: String, summary: String, Index: src/sql.rs ================================================================== --- src/sql.rs +++ src/sql.rs @@ -202,10 +202,13 @@ .bind(id.into()) .execute(&mut *self.0).await.stack()?; Ok(()) } + #[allow(clippy::too_many_arguments)] // XXX do I need to make it variadic? I guess it work fine + // this way for now, unless there would be a good struct + // with all source fields to use that as an argument pub async fn update (&mut self, update: Option, channel: &str, channel_id: i64, url: &str, iv_hash: Option<&str>, url_re: Option<&str>, owner: I) -> Result<&str> where I: Into { match match update { Some(id) => { sqlx::query("update rsstg_source set channel_id = $2, url = $3, iv_hash = $4, owner = $5, channel = $6, url_re = $7 where source_id = $1")