diff options
| author | bors <bors@rust-lang.org> | 2022-08-29 11:13:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-29 11:13:42 +0000 |
| commit | b96fa1a25ced4cfa72923e6d45f47f36c2c00ce0 (patch) | |
| tree | ec0bf002d8c6a9588ffe942f92d5d87af16bb87c | |
| parent | 7a42ca942cda0d197a63373127e7e373305957a0 (diff) | |
| parent | a4375cb2920835cfefaadaea3cf54025a463a214 (diff) | |
| download | rust-b96fa1a25ced4cfa72923e6d45f47f36c2c00ce0.tar.gz rust-b96fa1a25ced4cfa72923e6d45f47f36c2c00ce0.zip | |
Auto merge of #98626 - oli-obk:tracing, r=lcnr
bump tracing version Bump tracing dependency to 0.1.35 to give us features like printing the return value of functions
| -rw-r--r-- | Cargo.lock | 21 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/fulfill.rs | 1 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
3 files changed, 16 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 7c3879fdd98..b8f54a616ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4998,9 +4998,9 @@ checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -5010,9 +5010,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -5021,11 +5021,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ - "lazy_static", + "once_cell", + "valuable", ] [[package]] @@ -5345,6 +5346,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" [[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] name = "vcpkg" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/compiler/rustc_trait_selection/src/traits/fulfill.rs b/compiler/rustc_trait_selection/src/traits/fulfill.rs index 556ef466cd1..d840677f1ca 100644 --- a/compiler/rustc_trait_selection/src/traits/fulfill.rs +++ b/compiler/rustc_trait_selection/src/traits/fulfill.rs @@ -597,6 +597,7 @@ impl<'a, 'b, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'b, 'tcx> { } } + #[inline(never)] fn process_backedge<'c, I>( &mut self, cycle: I, diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 5770bb7bc33..2fe17e979c8 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -246,6 +246,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[ "unicode-width", "unicode-xid", "vcpkg", + "valuable", "version_check", "wasi", "winapi", |