diff options
| author | bors <bors@rust-lang.org> | 2020-07-02 12:35:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-02 12:35:08 +0000 |
| commit | 8a6d4342be6a6acbade8e7ef65e73d27ee8c9144 (patch) | |
| tree | bdb127fa9e94e052cdae4c50e5212d8080863342 /src/librustc_session | |
| parent | b7856f695d65a8ebc846754f97d15814bcb1c244 (diff) | |
| parent | 4f536f2c36622328e7eb1d859cb74ba0a7d34ac8 (diff) | |
Auto merge of #73954 - Manishearth:rollup-8qvh170, r=Manishearth
Rollup of 10 pull requests Successful merges: - #73414 (Implement `slice_strip` feature) - #73564 (linker: Create GNU_EH_FRAME header by default when producing ELFs) - #73622 (Deny unsafe ops in unsafe fns in libcore) - #73684 (add spans to injected coverage counters, extract with CoverageData query) - #73812 (ast_pretty: Pass some token streams and trees by reference) - #73853 (Add newline to rustc MultiSpan docs) - #73883 (Compile rustdoc less often.) - #73885 (Fix wasm32 being broken due to a NodeJS version bump) - #73903 (Changes required for rustc/cargo to build for iOS targets) - #73938 (Optimise fast path of checked_ops with `unlikely`) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_session')
| -rw-r--r-- | src/librustc_session/options.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_session/options.rs b/src/librustc_session/options.rs index ed5fd6dc702..2ad7d09cbf4 100644 --- a/src/librustc_session/options.rs +++ b/src/librustc_session/options.rs @@ -881,8 +881,9 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, (default: no)"), instrument_coverage: bool = (false, parse_bool, [TRACKED], "instrument the generated code with LLVM code region counters to (in the \ - future) generate coverage reports (default: no; note, the compiler build \ - config must include `profiler = true`)"), + future) generate coverage reports; disables/overrides some optimization \ + options (note, the compiler build config must include `profiler = true`) \ + (default: no)"), instrument_mcount: bool = (false, parse_bool, [TRACKED], "insert function instrument code for mcount-based tracing (default: no)"), keep_hygiene_data: bool = (false, parse_bool, [UNTRACKED], |