Rename ParseSess::span_diagnostic as ParseSess::dcx.

nnethercote · nnethercote · commit 7738d6900790 · 2023-12-18T16:06:21.000+11:00
diff --git a/src/parse/macros/cfg_if.rs b/src/parse/macros/cfg_if.rs
@@ -67,7 +67,7 @@ fn parse_cfg_if_inner<'a>(
                 Ok(None) => continue,
                 Err(err) => {
                     err.cancel();
-                    parser.sess.span_diagnostic.reset_err_count();
+                    parser.sess.dcx.reset_err_count();
                     return Err(
                         "Expected item inside cfg_if block, but failed to parse it as an item",
                     );
diff --git a/src/parse/macros/lazy_static.rs b/src/parse/macros/lazy_static.rs
@@ -16,16 +16,16 @@ pub(crate) fn parse_lazy_static(
         ($method:ident $(,)* $($arg:expr),* $(,)*) => {
             match parser.$method($($arg,)*) {
                 Ok(val) => {
-                    if parser.sess.span_diagnostic.has_errors().is_some() {
-                        parser.sess.span_diagnostic.reset_err_count();
+                    if parser.sess.dcx.has_errors().is_some() {
+                        parser.sess.dcx.reset_err_count();
                         return None;
                     } else {
                         val
                     }
                 }
                 Err(err) => {
                     err.cancel();
-                    parser.sess.span_diagnostic.reset_err_count();
+                    parser.sess.dcx.reset_err_count();
                     return None;
                 }
             }
diff --git a/src/parse/macros/mod.rs b/src/parse/macros/mod.rs
@@ -28,8 +28,8 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
             let mut cloned_parser = (*parser).clone();
             match $parser(&mut cloned_parser) {
                 Ok(x) => {
-                    if parser.sess.span_diagnostic.has_errors().is_some() {
-                        parser.sess.span_diagnostic.reset_err_count();
+                    if parser.sess.dcx.has_errors().is_some() {
+                        parser.sess.dcx.reset_err_count();
                     } else {
                         // Parsing succeeded.
                         *parser = cloned_parser;
@@ -38,7 +38,7 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
                 }
                 Err(e) => {
                     e.cancel();
-                    parser.sess.span_diagnostic.reset_err_count();
+                    parser.sess.dcx.reset_err_count();
                 }
             }
         };
diff --git a/src/parse/session.rs b/src/parse/session.rs
@@ -218,7 +218,7 @@ impl ParseSess {
     }
 
     pub(crate) fn set_silent_emitter(&mut self) {
-        self.parse_sess.span_diagnostic = DiagCtxt::with_emitter(silent_emitter());
+        self.parse_sess.dcx = DiagCtxt::with_emitter(silent_emitter());
     }
 
     pub(crate) fn span_to_filename(&self, span: Span) -> FileName {
@@ -285,7 +285,7 @@ impl ParseSess {
 impl ParseSess {
     pub(super) fn emit_diagnostics(&self, diagnostics: Vec<Diagnostic>) {
         for diagnostic in diagnostics {
-            self.parse_sess.span_diagnostic.emit_diagnostic(diagnostic);
+            self.parse_sess.dcx.emit_diagnostic(diagnostic);
         }
     }
 
@@ -294,11 +294,11 @@ impl ParseSess {
     }
 
     pub(super) fn has_errors(&self) -> bool {
-        self.parse_sess.span_diagnostic.has_errors().is_some()
+        self.parse_sess.dcx.has_errors().is_some()
     }
 
     pub(super) fn reset_errors(&self) {
-        self.parse_sess.span_diagnostic.reset_err_count();
+        self.parse_sess.dcx.reset_err_count();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,16 @@ pub(crate) fn parse_lazy_static(`
`16`	`16`	`($method:ident $(,)* $($arg:expr),* $(,)*) => {`
`17`	`17`	`match parser.$method($($arg,)*) {`
`18`	`18`	`Ok(val) => {`
`19`		`- if parser.sess.span_diagnostic.has_errors().is_some() {`
`20`		`- parser.sess.span_diagnostic.reset_err_count();`
	`19`	`+ if parser.sess.dcx.has_errors().is_some() {`
	`20`	`+ parser.sess.dcx.reset_err_count();`
`21`	`21`	`return None;`
`22`	`22`	`} else {`
`23`	`23`	`val`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`Err(err) => {`
`27`	`27`	`err.cancel();`
`28`		`- parser.sess.span_diagnostic.reset_err_count();`
	`28`	`+ parser.sess.dcx.reset_err_count();`
`29`	`29`	`return None;`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {`
`28`	`28`	`let mut cloned_parser = (*parser).clone();`
`29`	`29`	`match $parser(&mut cloned_parser) {`
`30`	`30`	`Ok(x) => {`
`31`		`- if parser.sess.span_diagnostic.has_errors().is_some() {`
`32`		`- parser.sess.span_diagnostic.reset_err_count();`
	`31`	`+ if parser.sess.dcx.has_errors().is_some() {`
	`32`	`+ parser.sess.dcx.reset_err_count();`
`33`	`33`	`} else {`
`34`	`34`	`// Parsing succeeded.`
`35`	`35`	`*parser = cloned_parser;`
`@@ -38,7 +38,7 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {`
`38`	`38`	`}`
`39`	`39`	`Err(e) => {`
`40`	`40`	`e.cancel();`
`41`		`- parser.sess.span_diagnostic.reset_err_count();`
	`41`	`+ parser.sess.dcx.reset_err_count();`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`};`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ impl ParseSess {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`pub(crate) fn set_silent_emitter(&mut self) {`
`221`		`- self.parse_sess.span_diagnostic = DiagCtxt::with_emitter(silent_emitter());`
	`221`	`+ self.parse_sess.dcx = DiagCtxt::with_emitter(silent_emitter());`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`pub(crate) fn span_to_filename(&self, span: Span) -> FileName {`
`@@ -285,7 +285,7 @@ impl ParseSess {`
`285`	`285`	`impl ParseSess {`
`286`	`286`	`pub(super) fn emit_diagnostics(&self, diagnostics: Vec<Diagnostic>) {`
`287`	`287`	`for diagnostic in diagnostics {`
`288`		`- self.parse_sess.span_diagnostic.emit_diagnostic(diagnostic);`
	`288`	`+ self.parse_sess.dcx.emit_diagnostic(diagnostic);`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`@@ -294,11 +294,11 @@ impl ParseSess {`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`pub(super) fn has_errors(&self) -> bool {`
`297`		`- self.parse_sess.span_diagnostic.has_errors().is_some()`
	`297`	`+ self.parse_sess.dcx.has_errors().is_some()`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`pub(super) fn reset_errors(&self) {`
`301`		`- self.parse_sess.span_diagnostic.reset_err_count();`
	`301`	`+ self.parse_sess.dcx.reset_err_count();`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`