mirror of https://github.com/rust-lang/rust.git
Inline and remove `StringReader::struct_fatal_span_char`.
It has a single call site.
This commit is contained in:
parent
4d35981703
commit
8e6bca63f9
|
@ -7,9 +7,7 @@ use rustc_ast::ast::{self, AttrStyle};
|
|||
use rustc_ast::token::{self, CommentKind, Delimiter, Token, TokenKind};
|
||||
use rustc_ast::tokenstream::TokenStream;
|
||||
use rustc_ast::util::unicode::contains_text_flow_control_chars;
|
||||
use rustc_errors::{
|
||||
error_code, Applicability, DiagCtxt, Diagnostic, DiagnosticBuilder, FatalAbort, StashKey,
|
||||
};
|
||||
use rustc_errors::{error_code, Applicability, DiagCtxt, Diagnostic, StashKey};
|
||||
use rustc_lexer::unescape::{self, EscapeError, Mode};
|
||||
use rustc_lexer::{Base, DocStyle, RawStrError};
|
||||
use rustc_lexer::{Cursor, LiteralKind};
|
||||
|
@ -344,18 +342,6 @@ impl<'a> StringReader<'a> {
|
|||
token::Ident(sym, false)
|
||||
}
|
||||
|
||||
fn struct_fatal_span_char(
|
||||
&self,
|
||||
from_pos: BytePos,
|
||||
to_pos: BytePos,
|
||||
m: &str,
|
||||
c: char,
|
||||
) -> DiagnosticBuilder<'a, FatalAbort> {
|
||||
self.sess
|
||||
.dcx
|
||||
.struct_span_fatal(self.mk_sp(from_pos, to_pos), format!("{}: {}", m, escaped_char(c)))
|
||||
}
|
||||
|
||||
/// Detect usages of Unicode codepoints changing the direction of the text on screen and loudly
|
||||
/// complain about it.
|
||||
fn lint_unicode_text_flow(&self, start: BytePos) {
|
||||
|
@ -568,13 +554,16 @@ impl<'a> StringReader<'a> {
|
|||
}
|
||||
|
||||
fn report_non_started_raw_string(&self, start: BytePos, bad_char: char) -> ! {
|
||||
self.struct_fatal_span_char(
|
||||
start,
|
||||
self.pos,
|
||||
"found invalid character; only `#` is allowed in raw string delimitation",
|
||||
bad_char,
|
||||
)
|
||||
.emit()
|
||||
self.sess
|
||||
.dcx
|
||||
.struct_span_fatal(
|
||||
self.mk_sp(start, self.pos),
|
||||
format!(
|
||||
"found invalid character; only `#` is allowed in raw string delimitation: {}",
|
||||
escaped_char(bad_char)
|
||||
),
|
||||
)
|
||||
.emit()
|
||||
}
|
||||
|
||||
fn report_unterminated_raw_string(
|
||||
|
|
Loading…
Reference in New Issue