Skip to content

Commit 70e88ff

Browse files
committed
clippy
1 parent 9b43a84 commit 70e88ff

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

cargo-shuttle/src/init.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ fn edit_shuttle_toml(path: &Path, set_name: Option<&str>) -> Result<()> {
259259

260260
doc.remove("name");
261261

262-
if doc.len() == 0 {
262+
if doc.is_empty() {
263263
// if "name" was the only property in the doc, delete the file
264264
let _ = std::fs::remove_file(&path);
265265

cargo-shuttle/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl Shuttle {
198198
// ProjectCommand::List does not need to know which project we are in
199199
ProjectCommand::Create
200200
| ProjectCommand::Update(..)
201-
| ProjectCommand::Status { .. }
201+
| ProjectCommand::Status
202202
| ProjectCommand::Delete { .. }
203203
| ProjectCommand::Link
204204
)

runtime/src/telemetry.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -464,18 +464,16 @@ fn init_tracer_provider(endpoint: &Option<String>, resource: Resource) -> Tracer
464464
provider
465465
}
466466

467+
pub type OtelLayerType = Layered<
468+
LogCourier<Registry>,
469+
Layered<OpenTelemetryLayer<Registry, Tracer>, MetricsLayer<Registry>, Registry>,
470+
Registry,
471+
>;
467472
// Construct tracing-subscriber layers and return ExporterGuard for opentelemetry-related termination processing
468473
pub fn otel_tracing_subscriber(
469474
crate_name: &'static str,
470475
package_version: &'static str,
471-
) -> (
472-
Layered<
473-
LogCourier<Registry>,
474-
Layered<OpenTelemetryLayer<Registry, Tracer>, MetricsLayer<Registry>, Registry>,
475-
Registry,
476-
>,
477-
ProviderGuard,
478-
) {
476+
) -> (OtelLayerType, ProviderGuard) {
479477
global::set_text_map_propagator(TraceContextPropagator::new());
480478

481479
let resource = resource(crate_name, package_version);
@@ -487,11 +485,7 @@ pub fn otel_tracing_subscriber(
487485
let meter = init_meter_provider(&endpoint, resource.clone());
488486
let logger = init_log_subscriber(&endpoint, resource);
489487

490-
let layers: Layered<
491-
LogCourier<Registry>,
492-
Layered<OpenTelemetryLayer<Registry, Tracer>, MetricsLayer<Registry>, Registry>,
493-
Registry,
494-
> = MetricsLayer::new(meter.clone())
488+
let layers: OtelLayerType = MetricsLayer::new(meter.clone())
495489
.and_then(OpenTelemetryLayer::new(tracer.tracer("shuttle-telemetry")))
496490
.and_then(LogCourier::new(logger.logger("shuttle-telemetry")));
497491

0 commit comments

Comments
 (0)