diff options
| author | bors <bors@rust-lang.org> | 2022-06-28 13:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-28 13:46:43 +0000 |
| commit | 00ebeb87ac87a492bd59ace6bd43d6ad1629ca4e (patch) | |
| tree | 08462526fb5f69acea449b972d435d0ebed03906 /compiler/rustc_errors/src | |
| parent | baf382e63c023259fa1f9042f8f479f183ca6ed3 (diff) | |
| parent | 66b806084ec50917ab6cb87c3774facfdf3038fa (diff) | |
| download | rust-00ebeb87ac87a492bd59ace6bd43d6ad1629ca4e.tar.gz rust-00ebeb87ac87a492bd59ace6bd43d6ad1629ca4e.zip | |
Auto merge of #98612 - Dylan-DPC:rollup-7tasikc, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #97346 (Remove a back-compat hack on lazy TAIT) - #98261 (Remove `MAX_SUGGESTION_HIGHLIGHT_LINES`) - #98337 ([RFC 2011] Optimize non-consuming operators) - #98384 (Fix RSS reporting on macOS) - #98420 (translation: lint fix + more migration) - #98430 (Refactor iter adapters with less macros) - #98555 (Hermit: Fix initializing lazy locks) - #98595 (Implement `Send` and `Sync` for `ThinBox<T>`) - #98597 (Remove unstable CStr/CString change from 1.62 release note) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index a4cbc73978d..8b2a995f1c5 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -656,11 +656,6 @@ impl Emitter for SilentEmitter { } } -/// Maximum number of lines we will print for a multiline suggestion; arbitrary. -/// -/// This should be replaced with a more involved mechanism to output multiline suggestions that -/// more closely mimics the regular diagnostic output, where irrelevant code lines are elided. -pub const MAX_SUGGESTION_HIGHLIGHT_LINES: usize = 6; /// Maximum number of suggestions to be shown /// /// Arbitrary, but taken from trait import suggestion limit |