chore: fix upstreaming leftovers (#617)

* chore: rename default branch to main

* chore: fix upstreaming leftovers

Author: JohnTitor

.github/workflows/ci-post-merge.yml

@@ -1,7 +1,7 @@
 name: CI (post-merge)
 
 on:
-  push: { branches: [master] }
+  push: { branches: [main] }
 
 permissions: { contents: read }
 

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
   merge_group:
     types: [checks_requested]
   push:
-    branches: [master]
+    branches: [main]
 
 permissions: { contents: read }
 

.github/workflows/coverage.yml

@@ -2,7 +2,7 @@ name: Coverage
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 permissions: { contents: read }
 

README.md

@@ -5,7 +5,7 @@
 <!-- prettier-ignore-start -->
 
 [![CI](https://github.com/actix/actix-extras/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-extras/actions/workflows/ci.yml)
-[![codecov](https://codecov.io/gh/actix/actix-extras/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-extras)
+[![codecov](https://codecov.io/gh/actix/actix-extras/branch/main/graph/badge.svg)](https://codecov.io/gh/actix/actix-extras)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/5Ux4QGChWc)
 [![Dependency Status](https://deps.rs/repo/github/actix/actix-extras/status.svg)](https://deps.rs/repo/github/actix/actix-extras)
 
@@ -23,6 +23,7 @@
 | [actix-settings]     | [![crates.io](https://img.shields.io/crates/v/actix-settings?label=latest)](https://crates.io/crates/actix-settings) [![dependency status](https://deps.rs/crate/actix-settings/latest/status.svg)](https://deps.rs/crate/actix-settings)                 | Easily manage Actix Web's settings from a TOML file and environment variables.  |
 | [actix-web-httpauth] | [![crates.io](https://img.shields.io/crates/v/actix-web-httpauth?label=latest)](https://crates.io/crates/actix-web-httpauth) [![dependency status](https://deps.rs/crate/actix-web-httpauth/latest/status.svg)](https://deps.rs/crate/actix-web-httpauth) | HTTP authentication schemes.                                                    |
 | [actix-ws]           | [![crates.io](https://img.shields.io/crates/v/actix-ws?label=latest)][actix-ws] [![dependency status](https://deps.rs/crate/actix-ws/latest/status.svg)](https://deps.rs/crate/actix-ws)                                                                  | WebSockets for Actix Web, without actors.                                       |
+| [tracing-actix-web]           | [![crates.io](https://img.shields.io/crates/v/tracing-actix-web?label=latest)][tracing-actix-web] [![dependency status](https://deps.rs/crate/tracing-actix-web/latest/status.svg)](https://deps.rs/crate/tracing-actix-web)                                                                  | Structured logging middleware for actix-web.                                       |
 
 ---
 
@@ -42,7 +43,6 @@ These crates are provided by the community.
 | [aliri_actix]              | [![crates.io](https://img.shields.io/crates/v/aliri_actix?label=latest)][aliri_actix] [![dependency status](https://deps.rs/crate/aliri_actix/latest/status.svg)](https://deps.rs/crate/aliri_actix)                                                     | Endpoint authorization and authentication using scoped OAuth2 JWT tokens.                         |
 | [actix-web-flash-messages] | [![crates.io](https://img.shields.io/crates/v/actix-web-flash-messages?label=latest)][actix-web-flash-messages] [![dependency status](https://deps.rs/crate/actix-web-flash-messages/latest/status.svg)](https://deps.rs/crate/actix-web-flash-messages) | Support for flash messages/one-time notifications in `actix-web`.                                 |
 | [awmp]                     | [![crates.io](https://img.shields.io/crates/v/awmp?label=latest)][awmp] [![dependency status](https://deps.rs/crate/awmp/latest/status.svg)](https://deps.rs/crate/awmp)                                                                                 | An easy to use wrapper around multipart fields for Actix Web.                                     |
-| [tracing-actix-web]        | [![crates.io](https://img.shields.io/crates/v/tracing-actix-web?label=latest)][tracing-actix-web] [![dependency status](https://deps.rs/crate/tracing-actix-web/latest/status.svg)](https://deps.rs/crate/tracing-actix-web)                             | A middleware to collect telemetry data from applications built on top of the Actix Web framework. |
 | [actix-hash]               | [![crates.io](https://img.shields.io/crates/v/actix-hash?label=latest)][actix-hash] [![dependency status](https://deps.rs/crate/actix-hash/latest/status.svg)](https://deps.rs/crate/actix-hash)                                                         | Hashing utilities for Actix Web.                                                                  |
 | [actix-bincode]            | ![crates.io](https://img.shields.io/crates/v/actix-bincode?label=latest) [![dependency status](https://deps.rs/crate/actix-bincode/latest/status.svg)](https://deps.rs/crate/actix-bincode)                                                              | Bincode payload extractor for Actix Web.                                                          |
 | [sentinel-actix]           | ![crates.io](https://img.shields.io/crates/v/sentinel-actix?label=latest) [![dependency status](https://deps.rs/crate/sentinel-actix/latest/status.svg)](https://deps.rs/crate/sentinel-actix)                                                           | General and flexible protection for Actix Web.                                                    |

actix-cors/README.md

@@ -68,5 +68,5 @@ async fn main() -> std::io::Result<()> {
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-cors)
-- [Example Project](https://github.com/actix/examples/tree/master/cors)
+- [Example Project](https://github.com/actix/examples/tree/main/cors)
 - Minimum Supported Rust Version (MSRV): 1.82

actix-protobuf/README.md

@@ -14,7 +14,7 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-protobuf)
-- [Example Project](https://github.com/actix/examples/tree/master/protobuf)
+- [Example Project](https://github.com/actix/examples/tree/main/protobuf)
 - Minimum Supported Rust Version (MSRV): 1.57
 
 ## Example
@@ -38,7 +38,7 @@ async fn index(msg: ProtoBuf<MyObj>) -> Result<HttpResponse> {
 }
 ```
 
-See [here](https://github.com/actix/examples/tree/master/protobuf) for the complete example.
+See [here](https://github.com/actix/examples/tree/main/protobuf) for the complete example.
 
 ## License
 

actix-settings/README.md

@@ -27,5 +27,5 @@ Have a look at [the usage example][usage] to see how.
 
 This crate was made possible by support from Accept B.V and [@jjpe].
 
-[usage]: https://github.com/actix/actix-extras/blob/master/actix-settings/examples/actix.rs
+[usage]: https://github.com/actix/actix-extras/blob/main/actix-settings/examples/actix.rs
 [@jjpe]: https://github.com/jjpe

actix-ws/README.md

@@ -61,7 +61,7 @@ async fn main() -> std::io::Result<()> {
 ## Resources
 
 - [API Documentation](https://docs.rs/actix-ws)
-- [Example Chat Project](https://github.com/actix/examples/tree/master/websockets/chat-actorless)
+- [Example Chat Project](https://github.com/actix/examples/tree/main/websockets/chat-actorless)
 - Minimum Supported Rust Version (MSRV): 1.82
 
 ## License

tracing-actix-web/Cargo.toml

@@ -10,19 +10,18 @@ members = [
 name = "tracing-actix-web"
 version = "0.7.19"
 authors = ["Luca Palmieri <[email protected]>"]
-edition = "2018"
-
-license = "MIT/Apache-2.0"
-
-repository = "https://github.com/LukeMathWalker/tracing-actix-web"
 documentation = "https://docs.rs/tracing-actix-web/"
 readme = "README.md"
-
 description = "Structured logging middleware for actix-web."
-
 keywords = ["http", "actix-web", "tracing", "logging"]
 categories = ["asynchronous", "web-programming"]
 
+repository.workspace = true
+homepage.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
 [features]
 default = ["emit_event_on_error"]
 opentelemetry_0_13 = [

tracing-actix-web/README.md

@@ -84,7 +84,7 @@ fn main() {
 }
 ```
 
-Check out [the examples on GitHub](https://github.com/LukeMathWalker/tracing-actix-web/tree/main/examples) to get a taste of how [`TracingLogger`] can be used to observe and monitor your
+Check out [the examples on GitHub](https://github.com/actix/tracing-actix-web/tree/main/examples) to get a taste of how [`TracingLogger`] can be used to observe and monitor your
 application.  
 
 # From zero to hero: a crash course in observability
@@ -312,7 +312,7 @@ You can then find all logs for the same request across all the services it touch
 If you add [`tracing-opentelemetry::OpenTelemetryLayer`](https://docs.rs/tracing-opentelemetry/0.17.0/tracing_opentelemetry/struct.OpenTelemetryLayer.html)
 in your `tracing::Subscriber` you will be able to export the root span (and all its children) as OpenTelemetry spans.
 
-Check out the [relevant example in the GitHub repository](https://github.com/LukeMathWalker/tracing-actix-web/tree/main/examples/opentelemetry) for reference.
+Check out the [relevant example in the GitHub repository](https://github.com/actix/tracing-actix-web/tree/main/examples/opentelemetry) for reference.
 
 # License