mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace a lazy RefCell<Option<T>> with OnceCell<T>

Browse Source
This commit is contained in:
Zalathar 2023-07-28 12:55:13 +10:00
parent 6cacb5247f
commit 8745fdc448
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_mir_transform/src/coverage/spans.rs
View File

@ -11,7 +11,7 @@ use rustc_middle::ty::TyCtxt;
use rustc_span::source_map::original_sp; use rustc_span::source_map::original_sp;
use rustc_span::{BytePos, ExpnKind, MacroKind, Span, Symbol}; use rustc_span::{BytePos, ExpnKind, MacroKind, Span, Symbol};
use std::cell::RefCell; use std::cell::OnceCell;
use std::cmp::Ordering; use std::cmp::Ordering;
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
@ -67,7 +67,7 @@ impl CoverageStatement {
pub(super) struct CoverageSpan { pub(super) struct CoverageSpan {
pub span: Span, pub span: Span,
pub expn_span: Span, pub expn_span: Span,
pub current_macro_or_none: RefCell<Option<Option<Symbol>>>, pub current_macro_or_none: OnceCell<Option<Symbol>>,
pub bcb: BasicCoverageBlock, pub bcb: BasicCoverageBlock,
pub coverage_statements: Vec<CoverageStatement>, pub coverage_statements: Vec<CoverageStatement>,
pub is_closure: bool, pub is_closure: bool,
@ -175,8 +175,7 @@ impl CoverageSpan {
/// If the span is part of a macro, returns the macro name symbol. /// If the span is part of a macro, returns the macro name symbol.
pub fn current_macro(&self) -> Option<Symbol> { pub fn current_macro(&self) -> Option<Symbol> {
self.current_macro_or_none self.current_macro_or_none
.borrow_mut() .get_or_init(|| {
.get_or_insert_with(|| {
if let ExpnKind::Macro(MacroKind::Bang, current_macro) = if let ExpnKind::Macro(MacroKind::Bang, current_macro) =
self.expn_span.ctxt().outer_expn_data().kind self.expn_span.ctxt().outer_expn_data().kind
{ {