diff options
| author | bors <bors@rust-lang.org> | 2021-03-02 12:57:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-02 12:57:06 +0000 |
| commit | 67342b830ebeca05ebafc09d8c7ed71b2ad821e1 (patch) | |
| tree | 4f22db53302ec9f0e7961f6ae92c28f79e87f5df /compiler/rustc_interface/src | |
| parent | edeee915b1c52f97411e57ef6b1a8bd46548a37a (diff) | |
| parent | 97f9b186ae6fbd03d9bf4892ec0320f17c623b6b (diff) | |
| download | rust-67342b830ebeca05ebafc09d8c7ed71b2ad821e1.tar.gz rust-67342b830ebeca05ebafc09d8c7ed71b2ad821e1.zip | |
Auto merge of #82698 - JohnTitor:rollup-htd533c, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #80189 (Convert primitives in the standard library to intra-doc links) - #80874 (Update intra-doc link documentation to match the implementation) - #82376 (Add option to enable MIR inlining independently of mir-opt-level) - #82516 (Add incomplete feature gate for inherent associate types.) - #82579 (Fix turbofish recovery with multiple generic args) - #82593 (Teach rustdoc how to display WASI.) - #82597 (Get TyCtxt from self instead of passing as argument in AutoTraitFinder) - #82627 (Erase late bound regions to avoid ICE) - #82661 (:arrow_up: rust-analyzer) - #82691 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/tests.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index a2e96146568..9a11b534887 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -557,8 +557,9 @@ fn test_debugging_options_tracking_hash() { tracked!(function_sections, Some(false)); tracked!(human_readable_cgu_names, true); tracked!(inline_in_all_cgus, Some(true)); - tracked!(inline_mir_threshold, 123); - tracked!(inline_mir_hint_threshold, 123); + tracked!(inline_mir, Some(true)); + tracked!(inline_mir_threshold, Some(123)); + tracked!(inline_mir_hint_threshold, Some(123)); tracked!(insert_sideeffect, true); tracked!(instrument_coverage, true); tracked!(instrument_mcount, true); |