1
0
mirror of https://github.com/actix/actix-website synced 2024-11-23 16:31:08 +01:00

chore(deps): bump derive_more from 0.99.18 to 1.0.0 in /examples (#432)

* chore(deps): bump derive_more from 0.99.18 to 1.0.0 in /examples

Bumps [derive_more](https://github.com/JelteF/derive_more) from 0.99.18 to 1.0.0.
- [Release notes](https://github.com/JelteF/derive_more/releases)
- [Changelog](https://github.com/JelteF/derive_more/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JelteF/derive_more/compare/v0.99.18...v1.0.0)

---
updated-dependencies:
- dependency-name: derive_more
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: upgrade derive_more calls

* ci: fix just invocation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>
This commit is contained in:
dependabot[bot] 2024-08-19 01:13:03 +00:00 committed by GitHub
parent 8a1f789d34
commit c2f760dbbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 51 additions and 20 deletions

View File

@ -27,4 +27,4 @@ jobs:
- name: Test examples
env:
RUSTFLAGS: -A dead-code -A unused-variables
run: just check-examples
run: just test

37
examples/Cargo.lock generated
View File

@ -56,7 +56,7 @@ dependencies = [
"actix-web",
"bitflags 2.5.0",
"bytes",
"derive_more",
"derive_more 0.99.18",
"futures-core",
"http-range",
"log",
@ -84,7 +84,7 @@ dependencies = [
"brotli",
"bytes",
"bytestring",
"derive_more",
"derive_more 0.99.18",
"encoding_rs",
"flate2",
"futures-core",
@ -180,7 +180,7 @@ dependencies = [
"actix-utils",
"actix-web",
"anyhow",
"derive_more",
"derive_more 0.99.18",
"serde",
"serde_json",
"tracing",
@ -238,7 +238,7 @@ dependencies = [
"bytestring",
"cfg-if",
"cookie",
"derive_more",
"derive_more 0.99.18",
"encoding_rs",
"futures-core",
"futures-util",
@ -991,6 +991,27 @@ dependencies = [
"syn 2.0.66",
]
[[package]]
name = "derive_more"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
dependencies = [
"derive_more-impl",
]
[[package]]
name = "derive_more-impl"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
"unicode-xid",
]
[[package]]
name = "diesel"
version = "2.2.2"
@ -1793,7 +1814,7 @@ name = "my_errors"
version = "1.0.0"
dependencies = [
"actix-web",
"derive_more",
"derive_more 1.0.0",
"env_logger",
"log",
]
@ -3152,6 +3173,12 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
[[package]]
name = "unicode-xid"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "universal-hash"
version = "0.5.1"

View File

@ -6,6 +6,6 @@ edition.workspace = true
[dependencies]
actix-web = "4"
derive_more = "0.99"
derive_more = { version = "1", features = ["display", "error"] }
env_logger = "0.11"
log = "0.4"

View File

@ -1,10 +1,10 @@
// <logging>
use actix_web::{error, get, middleware::Logger, App, HttpServer, Result};
use derive_more::{Display, Error};
use derive_more::derive::{Display, Error};
use log::info;
#[derive(Debug, Display, Error)]
#[display(fmt = "my error: {}", name)]
#[display("my error: {name}")]
pub struct MyError {
name: &'static str,
}

View File

@ -6,10 +6,10 @@ pub mod recommend_two;
// <response-error>
use actix_web::{error, Result};
use derive_more::{Display, Error};
use derive_more::derive::{Display, Error};
#[derive(Debug, Display, Error)]
#[display(fmt = "my error: {}", name)]
#[display("my error: {name}")]
struct MyError {
name: &'static str,
}

View File

@ -4,17 +4,17 @@ use actix_web::{
http::{header::ContentType, StatusCode},
App, HttpResponse,
};
use derive_more::{Display, Error};
use derive_more::derive::{Display, Error};
#[derive(Debug, Display, Error)]
enum MyError {
#[display(fmt = "internal error")]
#[display("internal error")]
InternalError,
#[display(fmt = "bad request")]
#[display("bad request")]
BadClientData,
#[display(fmt = "timeout")]
#[display("timeout")]
Timeout,
}

View File

@ -4,11 +4,11 @@ use actix_web::{
http::{header::ContentType, StatusCode},
App, HttpResponse, HttpServer,
};
use derive_more::{Display, Error};
use derive_more::derive::{Display, Error};
#[derive(Debug, Display, Error)]
enum UserError {
#[display(fmt = "Validation error on field: {}", field)]
#[display("Validation error on field: {field}")]
ValidationError { field: String },
}

View File

@ -4,11 +4,11 @@ use actix_web::{
http::{header::ContentType, StatusCode},
App, HttpResponse, HttpServer,
};
use derive_more::{Display, Error};
use derive_more::derive::{Display, Error};
#[derive(Debug, Display, Error)]
enum UserError {
#[display(fmt = "An internal error occurred. Please try again later.")]
#[display("An internal error occurred. Please try again later.")]
InternalError,
}

View File

@ -1,2 +1,6 @@
check-examples:
_list:
@just --list
# Tests examples.
test:
cd examples && cargo test