Skip to content

Commit

Permalink
Rollup merge of rust-lang#59809 - Zoxc:trait_methods_not_found, r=est…
Browse files Browse the repository at this point in the history
…ebank

Make trait_methods_not_found use a lock

r? @estebank
  • Loading branch information
Centril authored Apr 12, 2019
2 parents 2f71ecb + 9017d46 commit f4c8cc9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc/session/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ pub struct Session {
pub driver_lint_caps: FxHashMap<lint::LintId, lint::Level>,

/// `Span`s of trait methods that weren't found to avoid emitting object safety errors
pub trait_methods_not_found: OneThread<RefCell<FxHashSet<Span>>>,
pub trait_methods_not_found: Lock<FxHashSet<Span>>,
}

pub struct PerfStats {
Expand Down Expand Up @@ -1236,7 +1236,7 @@ fn build_session_(
has_global_allocator: Once::new(),
has_panic_handler: Once::new(),
driver_lint_caps,
trait_methods_not_found: OneThread::new(RefCell::new(Default::default())),
trait_methods_not_found: Lock::new(Default::default()),
};

validate_commandline_args_with_session_available(&sess);
Expand Down

0 comments on commit f4c8cc9

Please sign in to comment.