Convert Option<&Lrc<T>> return types to Option<&T>.

It's simpler and more concise.

Author: nnethercote

compiler/rustc_codegen_ssa/src/back/write.rs

@@ -11,7 +11,6 @@ use rustc_ast::attr;
 use rustc_data_structures::fx::{FxHashMap,FxIndexMap};
 use rustc_data_structures::memmap::Mmap;
 use rustc_data_structures::profiling::{SelfProfilerRef,VerboseTimingGuard};
-use rustc_data_structures::sync::Lrc;
 use rustc_errors::emitter::Emitter;
 use rustc_errors::translation::Translate;
 use rustc_errors::{
@@ -1889,7 +1888,7 @@ impl SharedEmitter {
 }
 
 implTranslateforSharedEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
 None
 }
 
@@ -1924,7 +1923,7 @@ impl Emitter for SharedEmitter {
 );
 }
 
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 None
 }
 }

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -34,8 +34,8 @@ pub struct AnnotateSnippetEmitter {
 }
 
 implTranslateforAnnotateSnippetEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
-self.fluent_bundle.as_ref()
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
+self.fluent_bundle.as_deref()
 }
 
 fnfallback_fluent_bundle(&self) -> &FluentBundle{
@@ -69,8 +69,8 @@ impl Emitter for AnnotateSnippetEmitter {
 );
 }
 
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
-self.source_map.as_ref()
+fnsource_map(&self) -> Option<&SourceMap>{
+self.source_map.as_deref()
 }
 
 fnshould_show_explain(&self) -> bool{

compiler/rustc_errors/src/emitter.rs

@@ -205,7 +205,7 @@ pub trait Emitter: Translate {
 false
 }
 
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>;
+fnsource_map(&self) -> Option<&SourceMap>;
 
 /// Formats the substitutions of the primary_span
 ///
@@ -481,8 +481,8 @@ pub trait Emitter: Translate {
 }
 
 implTranslateforHumanEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
-self.fluent_bundle.as_ref()
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
+self.fluent_bundle.as_deref()
 }
 
 fnfallback_fluent_bundle(&self) -> &FluentBundle{
@@ -491,8 +491,8 @@ impl Translate for HumanEmitter {
 }
 
 implEmitterforHumanEmitter{
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
-self.sm.as_ref()
+fnsource_map(&self) -> Option<&SourceMap>{
+self.sm.as_deref()
 }
 
 fnemit_diagnostic(&mutself,mutdiag:DiagInner){
@@ -540,7 +540,7 @@ pub struct SilentEmitter {
 }
 
 implTranslateforSilentEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
 None
 }
 
@@ -552,7 +552,7 @@ impl Translate for SilentEmitter {
 }
 
 implEmitterforSilentEmitter{
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 None
 }
 

compiler/rustc_errors/src/json.rs

@@ -111,8 +111,8 @@ enum EmitTyped<'a> {
 }
 
 implTranslateforJsonEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
-self.fluent_bundle.as_ref()
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
+self.fluent_bundle.as_deref()
 }
 
 fnfallback_fluent_bundle(&self) -> &FluentBundle{
@@ -172,7 +172,7 @@ impl Emitter for JsonEmitter {
 }
 }
 
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 Some(&self.sm)
 }
 

compiler/rustc_errors/src/lib.rs

@@ -59,7 +59,7 @@ use registry::Registry;
 use rustc_data_structures::AtomicRef;
 use rustc_data_structures::fx::{FxHashSet,FxIndexMap,FxIndexSet};
 use rustc_data_structures::stable_hasher::{Hash128,StableHasher};
-use rustc_data_structures::sync::{Lock,Lrc};
+use rustc_data_structures::sync::Lock;
 pubuse rustc_error_messages::{
 DiagMessage,FluentBundle,LanguageIdentifier,LazyFallbackBundle,MultiSpan,SpanLabel,
 SubdiagMessage, fallback_fluent_bundle, fluent_bundle,
@@ -685,13 +685,13 @@ impl DiagCtxt {
 unimplemented!("false emitter must only used during `wrap_emitter`")
 }
 
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 unimplemented!("false emitter must only used during `wrap_emitter`")
 }
 }
 
 impl translation::TranslateforFalseEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
 unimplemented!("false emitter must only used during `wrap_emitter`")
 }
 

compiler/rustc_errors/src/tests.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::sync::{IntoDynSyncSend,Lrc};
+use rustc_data_structures::sync::IntoDynSyncSend;
 use rustc_error_messages::fluent_bundle::resolver::errors::{ReferenceKind,ResolverError};
 use rustc_error_messages::{DiagMessage, langid};
 
@@ -12,7 +12,7 @@ struct Dummy {
 }
 
 implTranslateforDummy{
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&FluentBundle>{
 None
 }
 

compiler/rustc_errors/src/translation.rs

@@ -2,7 +2,6 @@ use std::borrow::Cow;
 use std::env;
 use std::error::Report;
 
-use rustc_data_structures::sync::Lrc;
 pubuse rustc_error_messages::FluentArgs;
 use tracing::{debug, trace};
 
@@ -33,7 +32,7 @@ pub trait Translate {
 /// Return `FluentBundle` with localized diagnostics for the locale requested by the user. If no
 /// language was requested by the user then this will be `None` and `fallback_fluent_bundle`
 /// should be used.
-fnfluent_bundle(&self) -> Option<&Lrc<FluentBundle>>;
+fnfluent_bundle(&self) -> Option<&FluentBundle>;
 
 /// Return `FluentBundle` with localized diagnostics for the default locale of the compiler.
 /// Used when the user has not requested a specific language or when a localized diagnostic is

src/librustdoc/passes/lint/check_code_block_syntax.rs

@@ -145,7 +145,7 @@ struct BufferEmitter {
 }
 
 implTranslateforBufferEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<rustc_errors::FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&rustc_errors::FluentBundle>{
 None
 }
 
@@ -169,7 +169,7 @@ impl Emitter for BufferEmitter {
 }
 }
 
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 None
 }
 }

src/tools/rustfmt/src/parse/session.rs

@@ -46,7 +46,7 @@ impl SilentOnIgnoredFilesEmitter {
 }
 
 implTranslateforSilentOnIgnoredFilesEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<rustc_errors::FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&rustc_errors::FluentBundle>{
 self.emitter.fluent_bundle()
 }
 
@@ -56,7 +56,7 @@ impl Translate for SilentOnIgnoredFilesEmitter {
 }
 
 implEmitterforSilentOnIgnoredFilesEmitter{
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 None
 }
 
@@ -344,7 +344,7 @@ mod tests {
 }
 
 implTranslateforTestEmitter{
-fnfluent_bundle(&self) -> Option<&Lrc<rustc_errors::FluentBundle>>{
+fnfluent_bundle(&self) -> Option<&rustc_errors::FluentBundle>{
 None
 }
 
@@ -354,7 +354,7 @@ mod tests {
 }
 
 implEmitterforTestEmitter{
-fnsource_map(&self) -> Option<&Lrc<SourceMap>>{
+fnsource_map(&self) -> Option<&SourceMap>{
 None
 }