diff options
| author | bors <bors@rust-lang.org> | 2021-02-28 01:15:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-28 01:15:16 +0000 |
| commit | 130b2ab0ed272f93dd5d019e72ac1fd4b4a77323 (patch) | |
| tree | 2f473a556bbf5bad361cc84af6a1ac0f57d0b7f6 /compiler/rustc_codegen_llvm | |
| parent | 94736c434ee154b30e2ec22ec112b79e3f6c5884 (diff) | |
| parent | 7847f690fd5d2a92cad833564fc05305d85c5634 (diff) | |
| download | rust-130b2ab0ed272f93dd5d019e72ac1fd4b4a77323.tar.gz rust-130b2ab0ed272f93dd5d019e72ac1fd4b4a77323.zip | |
Auto merge of #82611 - Dylan-DPC:rollup-l7xlpks, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #81856 (Suggest character encoding is incorrect when encountering random null bytes) - #82395 (Add missing "see its documentation for more" stdio) - #82401 (Remove a redundant macro) - #82498 (Use log level to control partitioning debug output) - #82534 (Link crtbegin/crtend on musl to terminate .eh_frame) - #82537 (Update measureme dependency to the latest version) - #82561 (doc: cube root, not cubic root) - #82563 (Fix intra-doc handling of `Self` in enum) - #82584 (Add ARIA role to sidebar toggle in Rustdoc) - #82596 (clarify RW lock's priority gotcha) - #82607 (Add a getter for Frame.loc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index 260edd9570b..4999cb3c7ab 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -12,7 +12,7 @@ doctest = false bitflags = "1.0" cstr = "0.2" libc = "0.2" -measureme = "9.0.0" +measureme = "9.1.0" snap = "1" tracing = "0.1" rustc_middle = { path = "../rustc_middle" } |