Skip to content

Commit

Permalink
Merge branch 'main' into url-encode-headers
Browse files Browse the repository at this point in the history
  • Loading branch information
cijothomas authored Feb 28, 2024
2 parents 73466a9 + 5e67cae commit ce0d356
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion opentelemetry-jaeger/src/exporter/thrift/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#![allow(unused_imports)]
#![allow(unused_extern_crates)]
#![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments, clippy::type_complexity))]
#![cfg_attr(clippy, allow(clippy::too_many_arguments, clippy::type_complexity))]
#![cfg_attr(rustfmt, rustfmt_skip)]

extern crate thrift;
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-jaeger/src/exporter/thrift/jaeger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#![allow(unused_imports)]
#![allow(unused_extern_crates)]
#![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments, clippy::type_complexity))]
#![cfg_attr(clippy, allow(clippy::too_many_arguments, clippy::type_complexity))]
#![cfg_attr(rustfmt, rustfmt_skip)]

extern crate thrift;
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-jaeger/src/exporter/thrift/zipkincore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#![allow(unused_imports)]
#![allow(unused_extern_crates)]
#![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments, clippy::type_complexity))]
#![cfg_attr(clippy, allow(clippy::too_many_arguments, clippy::type_complexity))]
#![cfg_attr(rustfmt, rustfmt_skip)]

extern crate thrift;
Expand Down

0 comments on commit ce0d356

Please sign in to comment.