diff options
| author | bors <bors@rust-lang.org> | 2024-10-07 11:30:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-07 11:30:33 +0000 |
| commit | 7caad6925314911eefe54b040d4bc5be940e8f92 (patch) | |
| tree | 2f684b45872dfefad4784760ab3077c529659176 /compiler/rustc_errors/src/json.rs | |
| parent | 0b16baa570d26224612ea27f76d68e4c6ca135cc (diff) | |
| parent | fd2278d017e3a06efb9ee8698dcd4a5b95d2482d (diff) | |
| download | rust-7caad6925314911eefe54b040d4bc5be940e8f92.tar.gz rust-7caad6925314911eefe54b040d4bc5be940e8f92.zip | |
Auto merge of #131354 - matthiaskrgr:rollup-hprnng2, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #131331 (Revert "warn_old_master_branch" check) - #131344 (Avoid `&Lrc<T>` in various places) - #131346 (Restrict `ignore-mode-*` directives) - #131353 (Add documentation for `runtest::check_rustdoc_test_option` method) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/json.rs')
| -rw-r--r-- | compiler/rustc_errors/src/json.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_errors/src/json.rs b/compiler/rustc_errors/src/json.rs index 1972a522e39..1534e256520 100644 --- a/compiler/rustc_errors/src/json.rs +++ b/compiler/rustc_errors/src/json.rs @@ -111,8 +111,8 @@ enum EmitTyped<'a> { } impl Translate for JsonEmitter { - fn fluent_bundle(&self) -> Option<&Lrc<FluentBundle>> { - self.fluent_bundle.as_ref() + fn fluent_bundle(&self) -> Option<&FluentBundle> { + self.fluent_bundle.as_deref() } fn fallback_fluent_bundle(&self) -> &FluentBundle { @@ -172,7 +172,7 @@ impl Emitter for JsonEmitter { } } - fn source_map(&self) -> Option<&Lrc<SourceMap>> { + fn source_map(&self) -> Option<&SourceMap> { Some(&self.sm) } |