Skip to content

Commit

Permalink
build(deps): bump taiki-e/install-action from 2.26.18 to 2.27.2 (#3294)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>
  • Loading branch information
dependabot[bot] and robjtede committed Feb 19, 2024
1 parent 289f749 commit 8c31d13
Show file tree
Hide file tree
Showing 43 changed files with 39 additions and 97 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
toolchain: ${{ matrix.version.version }}

- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/install-action@v2.26.18
uses: taiki-e/install-action@v2.27.2
with:
tool: cargo-hack,cargo-ci-cache-clean

Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0

- name: Install cargo-hack
uses: taiki-e/install-action@v2.26.18
uses: taiki-e/install-action@v2.27.2
with:
tool: cargo-hack

Expand All @@ -106,7 +106,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0

- name: Install nextest
uses: taiki-e/install-action@v2.26.18
uses: taiki-e/install-action@v2.27.2
with:
tool: nextest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
toolchain: ${{ matrix.version.version }}

- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/install-action@v2.26.18
uses: taiki-e/install-action@v2.27.2
with:
tool: cargo-hack,cargo-ci-cache-clean

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
components: llvm-tools-preview

- name: Install cargo-llvm-cov
uses: taiki-e/install-action@v2.26.18
uses: taiki-e/install-action@v2.27.2
with:
tool: cargo-llvm-cov

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
toolchain: nightly-2023-08-25

- name: Install cargo-public-api
uses: taiki-e/install-action@v2.26.18
uses: taiki-e/install-action@v2.27.2
with:
tool: cargo-public-api

Expand Down
2 changes: 1 addition & 1 deletion actix-files/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ mod tests {
dev::ServiceFactory,
guard,
http::{
header::{self, ContentDisposition, DispositionParam, DispositionType},
header::{self, ContentDisposition, DispositionParam},
Method, StatusCode,
},
middleware::Compress,
Expand Down
1 change: 0 additions & 1 deletion actix-http/src/body/message_body.rs
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,6 @@ where
mod tests {
use actix_rt::pin;
use actix_utils::future::poll_fn;
use bytes::{Bytes, BytesMut};
use futures_util::stream;

use super::*;
Expand Down
4 changes: 1 addition & 3 deletions actix-http/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,7 @@ pub enum ContentTypeError {

#[cfg(test)]
mod tests {
use std::io;

use http::{Error as HttpError, StatusCode};
use http::Error as HttpError;

use super::*;

Expand Down
3 changes: 0 additions & 3 deletions actix-http/src/h1/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@ impl Encoder<Message<(Response<()>, BodySize)>> for Codec {

#[cfg(test)]
mod tests {
use bytes::BytesMut;
use http::Method;

use super::*;
use crate::HttpMessage as _;

Expand Down
9 changes: 1 addition & 8 deletions actix-http/src/h1/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -563,15 +563,8 @@ impl Decoder for PayloadDecoder {

#[cfg(test)]
mod tests {
use bytes::{Bytes, BytesMut};
use http::{Method, Version};

use super::*;
use crate::{
error::ParseError,
header::{HeaderName, SET_COOKIE},
HttpMessage as _,
};
use crate::{header::SET_COOKIE, HttpMessage as _};

impl PayloadType {
pub(crate) fn unwrap(self) -> PayloadDecoder {
Expand Down
2 changes: 1 addition & 1 deletion actix-http/src/ws/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ pub fn handshake_response(req: &RequestHead) -> ResponseBuilder {
#[cfg(test)]
mod tests {
use super::*;
use crate::{header, test::TestRequest, Method};
use crate::{header, test::TestRequest};

#[test]
fn test_handshake() {
Expand Down
5 changes: 1 addition & 4 deletions actix-http/src/ws/proto.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use std::{
convert::{From, Into},
fmt,
};
use std::fmt;

use base64::prelude::*;
use tracing::error;
Expand Down
2 changes: 1 addition & 1 deletion actix-multipart/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ mod tests {
test::TestRequest,
FromRequest,
};
use bytes::{BufMut as _, Bytes};
use bytes::BufMut as _;
use futures_util::{future::lazy, StreamExt as _};
use tokio::sync::mpsc;
use tokio_stream::wrappers::UnboundedReceiverStream;
Expand Down
4 changes: 2 additions & 2 deletions actix-router/src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,10 @@ impl<'de> de::VariantAccess<'de> for UnitVariant {

#[cfg(test)]
mod tests {
use serde::{de, Deserialize};
use serde::Deserialize;

use super::*;
use crate::{path::Path, router::Router, ResourceDef};
use crate::{router::Router, ResourceDef};

#[derive(Deserialize)]
struct MyStruct {
Expand Down
2 changes: 0 additions & 2 deletions actix-web-actors/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,11 @@ where
mod tests {
use std::time::Duration;

use actix::Actor;
use actix_web::{
http::StatusCode,
test::{call_service, init_service, read_body, TestRequest},
web, App, HttpResponse,
};
use bytes::Bytes;

use super::*;

Expand Down
5 changes: 1 addition & 4 deletions actix-web-actors/src/ws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -817,10 +817,7 @@ where

#[cfg(test)]
mod tests {
use actix_web::{
http::{header, Method},
test::TestRequest,
};
use actix_web::test::TestRequest;

use super::*;

Expand Down
1 change: 0 additions & 1 deletion actix-web/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ mod tests {
Method, StatusCode,
},
middleware::DefaultHeaders,
service::ServiceRequest,
test::{call_service, init_service, read_body, try_init_service, TestRequest},
web, HttpRequest, HttpResponse,
};
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/guard/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ impl Guard for HeaderGuard {

#[cfg(test)]
mod tests {
use actix_http::{header, Method};
use actix_http::Method;

use super::*;
use crate::test::TestRequest;
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/http/header/content_length.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ mod tests {
use std::fmt;

use super::*;
use crate::{http::header::Header, test::TestRequest, HttpRequest};
use crate::{test::TestRequest, HttpRequest};

fn req_from_raw_headers<H: Header, I: IntoIterator<Item = V>, V: AsRef<[u8]>>(
header_lines: I,
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/middleware/condition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ mod tests {
use super::*;
use crate::{
body::BoxBody,
dev::{ServiceRequest, ServiceResponse},
dev::ServiceRequest,
error::Result,
http::{
header::{HeaderValue, CONTENT_TYPE},
Expand Down
2 changes: 0 additions & 2 deletions actix-web/src/middleware/default_headers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ mod tests {

use super::*;
use crate::{
dev::ServiceRequest,
http::header::CONTENT_TYPE,
test::{self, TestRequest},
HttpResponse,
};
Expand Down
5 changes: 1 addition & 4 deletions actix-web/src/middleware/err_handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,7 @@ mod tests {
use super::*;
use crate::{
body,
http::{
header::{HeaderValue, CONTENT_TYPE},
StatusCode,
},
http::header::{HeaderValue, CONTENT_TYPE},
test::{self, TestRequest},
};

Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/middleware/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ impl<'a> fmt::Display for FormatDisplay<'a> {

#[cfg(test)]
mod tests {
use actix_service::{IntoService, Service, Transform};
use actix_service::IntoService;
use actix_utils::future::ok;

use super::*;
Expand Down
1 change: 0 additions & 1 deletion actix-web/src/middleware/normalize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ mod tests {

use super::*;
use crate::{
dev::ServiceRequest,
guard::fn_guard,
test::{call_service, init_service, TestRequest},
web, App, HttpResponse,
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/redirect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ impl Responder for Redirect {
#[cfg(test)]
mod tests {
use super::*;
use crate::{dev::Service, http::StatusCode, test, App};
use crate::{dev::Service, test, App};

#[actix_rt::test]
async fn absolute_redirects() {
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ mod tests {

use super::*;
use crate::{
dev::{ResourceDef, ResourceMap, Service},
dev::{ResourceDef, Service},
http::{header, StatusCode},
test::{self, call_service, init_service, read_body, TestRequest},
web, App, HttpResponse,
Expand Down
10 changes: 2 additions & 8 deletions actix-web/src/resource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -540,20 +540,14 @@ mod tests {
use std::time::Duration;

use actix_rt::time::sleep;
use actix_service::Service;
use actix_utils::future::ok;

use super::*;
use crate::{
guard,
http::{
header::{self, HeaderValue},
Method, StatusCode,
},
http::{header::HeaderValue, Method, StatusCode},
middleware::DefaultHeaders,
service::{ServiceRequest, ServiceResponse},
test::{call_service, init_service, TestRequest},
web, App, Error, HttpMessage, HttpResponse,
App, HttpMessage,
};

#[test]
Expand Down
5 changes: 1 addition & 4 deletions actix-web/src/response/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,7 @@ mod tests {
use super::*;
use crate::{
body,
http::{
header::{self, HeaderValue, CONTENT_TYPE},
StatusCode,
},
http::header::{HeaderValue, CONTENT_TYPE},
test::assert_body_eq,
};

Expand Down
5 changes: 1 addition & 4 deletions actix-web/src/response/customize_responder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,7 @@ mod tests {

use super::*;
use crate::{
http::{
header::{HeaderValue, CONTENT_TYPE},
StatusCode,
},
http::header::{HeaderValue, CONTENT_TYPE},
test::TestRequest,
};

Expand Down
6 changes: 1 addition & 5 deletions actix-web/src/response/responder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,11 @@ impl_into_string_responder!(Cow<'_, str>);
pub(crate) mod tests {
use actix_http::body::to_bytes;
use actix_service::Service;
use bytes::{Bytes, BytesMut};

use super::*;
use crate::{
error,
http::{
header::{HeaderValue, CONTENT_TYPE},
StatusCode,
},
http::header::{HeaderValue, CONTENT_TYPE},
test::{assert_body_eq, init_service, TestRequest},
web, App,
};
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/response/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ mod tests {
use static_assertions::assert_impl_all;

use super::*;
use crate::http::header::{HeaderValue, COOKIE};
use crate::http::header::COOKIE;

assert_impl_all!(HttpResponse: Responder);
assert_impl_all!(HttpResponse<String>: Responder);
Expand Down
2 changes: 0 additions & 2 deletions actix-web/src/scope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,6 @@ impl ServiceFactory<ServiceRequest> for ScopeEndpoint {

#[cfg(test)]
mod tests {
use actix_service::Service;
use actix_utils::future::ok;
use bytes::Bytes;

Expand All @@ -559,7 +558,6 @@ mod tests {
Method, StatusCode,
},
middleware::DefaultHeaders,
service::{ServiceRequest, ServiceResponse},
test::{assert_body_eq, call_service, init_service, read_body, TestRequest},
web, App, HttpMessage, HttpRequest, HttpResponse,
};
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ mod tests {
use crate::{
guard, http,
test::{self, init_service, TestRequest},
web, App, HttpResponse,
web, App,
};

#[actix_rt::test]
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/test/test_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ mod tests {
use std::time::SystemTime;

use super::*;
use crate::{http::header, test::init_service, web, App, Error, HttpResponse, Responder};
use crate::{http::header, test::init_service, web, App, Error, Responder};

#[actix_rt::test]
async fn test_basics() {
Expand Down
5 changes: 1 addition & 4 deletions actix-web/src/types/either.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,7 @@ mod tests {
use serde::{Deserialize, Serialize};

use super::*;
use crate::{
test::TestRequest,
web::{Form, Json},
};
use crate::test::TestRequest;

#[derive(Debug, Clone, Serialize, Deserialize)]
struct TestForm {
Expand Down
2 changes: 1 addition & 1 deletion actix-web/src/types/form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ mod tests {
use super::*;
use crate::{
http::{
header::{HeaderValue, CONTENT_LENGTH, CONTENT_TYPE},
header::{HeaderValue, CONTENT_TYPE},
StatusCode,
},
test::{assert_body_eq, TestRequest},
Expand Down

0 comments on commit 8c31d13

Please sign in to comment.