bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove some no-longer-needed pub(crate) markers.

Browse source
This commit is contained in:
Nicholas Nethercote 2024-02-21 09:57:58 +11:00
parent 8f20a54c6d
commit 1407057b16
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_errors/src/diagnostic.rs
View file

@ -490,11 +490,9 @@ pub struct DiagnosticBuilder<'a, G: EmissionGuarantee = ErrorGuaranteed> {
/// often used as a return value, especially within the frequently-used /// often used as a return value, especially within the frequently-used
/// `PResult` type. In theory, return value optimization (RVO) should avoid /// `PResult` type. In theory, return value optimization (RVO) should avoid
/// unnecessary copying. In practice, it does not (at the time of writing). /// unnecessary copying. In practice, it does not (at the time of writing).
// FIXME(nnethercote) Make private once this moves to diagnostic.rs. diag: Option<Box<Diagnostic>>,
pub(crate) diag: Option<Box<Diagnostic>>,
// FIXME(nnethercote) Make private once this moves to diagnostic.rs. _marker: PhantomData<G>,
pub(crate) _marker: PhantomData<G>,
} }
// Cloning a `DiagnosticBuilder` is a recipe for a diagnostic being emitted // Cloning a `DiagnosticBuilder` is a recipe for a diagnostic being emitted
@ -1246,21 +1244,18 @@ impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> {
/// Takes the diagnostic. For use by methods that consume the /// Takes the diagnostic. For use by methods that consume the
/// DiagnosticBuilder: `emit`, `cancel`, etc. Afterwards, `drop` is the /// DiagnosticBuilder: `emit`, `cancel`, etc. Afterwards, `drop` is the
/// only code that will be run on `self`. /// only code that will be run on `self`.
// FIXME(nnethercote) Make private once this moves to diagnostic.rs. fn take_diag(&mut self) -> Diagnostic {
pub(crate) fn take_diag(&mut self) -> Diagnostic {
Box::into_inner(self.diag.take().unwrap()) Box::into_inner(self.diag.take().unwrap())
} }
/// Most `emit_producing_guarantee` functions use this as a starting point. /// Most `emit_producing_guarantee` functions use this as a starting point.
// FIXME(nnethercote) Make private once this moves to diagnostic.rs. fn emit_producing_nothing(mut self) {
pub(crate) fn emit_producing_nothing(mut self) {
let diag = self.take_diag(); let diag = self.take_diag();
self.dcx.emit_diagnostic(diag); self.dcx.emit_diagnostic(diag);
} }
/// `ErrorGuaranteed::emit_producing_guarantee` uses this. /// `ErrorGuaranteed::emit_producing_guarantee` uses this.
// FIXME(nnethercote) Make private once this moves to diagnostic.rs. fn emit_producing_error_guaranteed(mut self) -> ErrorGuaranteed {
pub(crate) fn emit_producing_error_guaranteed(mut self) -> ErrorGuaranteed {
let diag = self.take_diag(); let diag = self.take_diag();
// The only error levels that produce `ErrorGuaranteed` are // The only error levels that produce `ErrorGuaranteed` are