Skip to content

Commit a49570f

Browse files
fee1-deadfee1-dead
committed
fix TODO comments
1 parent 76d1f93 commit a49570f

File tree

8 files changed

+82
-67
lines changed

8 files changed

+82
-67
lines changed

‎compiler/rustc_ast/src/util/literal.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,14 @@ impl fmt::Display for LitKind {
240240
string = symbol
241241
)?;
242242
}
243-
// TODO need to reescape
244-
LitKind::CStr(..) => todo!(),
243+
LitKind::CStr(ref bytes, StrStyle::Cooked) => {
244+
write!(f, "c\"{}\"", escape_byte_str_symbol(bytes))?
245+
}
246+
LitKind::CStr(ref bytes, StrStyle::Raw(n)) => {
247+
// This can only be valid UTF-8.
248+
let symbol = str::from_utf8(bytes).unwrap();
249+
write!(f, "cr{delim}\"{symbol}\"{delim}", delim = "#".repeat(n as usize),)?;
250+
}
245251
LitKind::Int(n, ty) => {
246252
write!(f, "{n}")?;
247253
match ty {

‎compiler/rustc_ast_pretty/src/pprust/state.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,10 @@ pub fn literal_to_string(lit: token::Lit) -> String {
210210
token::ByteStrRaw(n) => {
211211
format!("br{delim}\"{string}\"{delim}", delim = "#".repeat(n as usize), string = symbol)
212212
}
213-
// TODO
214-
token::CStr | token::CStrRaw(_) => todo!(),
213+
token::CStr => format!("c\"{symbol}\""),
214+
token::CStrRaw(n) => {
215+
format!("cr{delim}\"{symbol}\"{delim}", delim = "#".repeat(n as usize))
216+
}
215217
token::Integer | token::Float | token::Bool | token::Err => symbol.to_string(),
216218
};
217219

‎compiler/rustc_builtin_macros/src/concat_bytes.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ fn invalid_type_err(
1919
let snippet = cx.sess.source_map().span_to_snippet(span).ok();
2020
match ast::LitKind::from_token_lit(token_lit) {
2121
Ok(ast::LitKind::CStr(_, _)) => {
22-
// TODO
23-
cx.span_err(span, "cannot concatenate C string litearls");
22+
// FIXME(c_str_literals): should concatenation of C string literals
23+
// include the null bytes in the end?
24+
cx.span_err(span, "cannot concatenate C string literals");
2425
}
2526
Ok(ast::LitKind::Char(_)) => {
2627
let sugg =

‎compiler/rustc_expand/src/proc_macro_server.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ impl FromInternal<token::LitKind> for LitKind {
6161
token::StrRaw(n) => LitKind::StrRaw(n),
6262
token::ByteStr => LitKind::ByteStr,
6363
token::ByteStrRaw(n) => LitKind::ByteStrRaw(n),
64-
// TODO
65-
token::CStr | token::CStrRaw(_) => todo!(),
64+
token::CStr => LitKind::CStr,
65+
token::CStrRaw(n) => LitKind::CStrRaw(n),
6666
token::Err => LitKind::Err,
6767
token::Bool => unreachable!(),
6868
}
@@ -80,6 +80,8 @@ impl ToInternal<token::LitKind> for LitKind {
8080
LitKind::StrRaw(n) => token::StrRaw(n),
8181
LitKind::ByteStr => token::ByteStr,
8282
LitKind::ByteStrRaw(n) => token::ByteStrRaw(n),
83+
LitKind::CStr => token::CStr,
84+
LitKind::CStrRaw(n) => token::CStrRaw(n),
8385
LitKind::Err => token::Err,
8486
}
8587
}

‎compiler/rustc_feature/src/active.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,10 @@ declare_features! (
311311
(active, async_closure, "1.37.0", Some(62290), None),
312312
/// Allows async functions to be declared, implemented, and used in traits.
313313
(active, async_fn_in_trait, "1.66.0", Some(91611), None),
314-
/// Treat `extern "C"` function as nounwind.
315-
(active, c_unwind, "1.52.0", Some(74990), None),
316314
/// Allows `c"foo"` literals.
317315
(active, c_str_literals, "CURRENT_RUSTC_VERSION", Some(105723), None),
316+
/// Treat `extern "C"` function as nounwind.
317+
(active, c_unwind, "1.52.0", Some(74990), None),
318318
/// Allows using C-variadics.
319319
(active, c_variadic, "1.34.0", Some(44930), None),
320320
/// Allows the use of `#[cfg(sanitize = "option")]`; set when -Zsanitizer is used.

‎compiler/rustc_lexer/src/lib.rs

Lines changed: 51 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -361,65 +361,18 @@ impl Cursor<'_> {
361361
},
362362

363363
// Byte literal, byte string literal, raw byte string literal or identifier.
364-
'b' => match (self.first(), self.second()) {
365-
('\'', _) => {
366-
self.bump();
367-
let terminated = self.single_quoted_string();
368-
let suffix_start = self.pos_within_token();
369-
if terminated {
370-
self.eat_literal_suffix();
371-
}
372-
let kind = Byte { terminated };
373-
Literal { kind, suffix_start }
374-
}
375-
('"', _) => {
376-
self.bump();
377-
let terminated = self.double_quoted_string();
378-
let suffix_start = self.pos_within_token();
379-
if terminated {
380-
self.eat_literal_suffix();
381-
}
382-
let kind = ByteStr { terminated };
383-
Literal { kind, suffix_start }
384-
}
385-
('r', '"') | ('r', '#') => {
386-
self.bump();
387-
let res = self.raw_double_quoted_string(2);
388-
let suffix_start = self.pos_within_token();
389-
if res.is_ok() {
390-
self.eat_literal_suffix();
391-
}
392-
let kind = RawByteStr { n_hashes: res.ok() };
393-
Literal { kind, suffix_start }
394-
}
395-
_ => self.ident_or_unknown_prefix(),
396-
},
364+
'b' => self.c_or_byte_string(
365+
|terminated| ByteStr { terminated },
366+
|n_hashes| RawByteStr { n_hashes },
367+
Some(|terminated| Byte { terminated }),
368+
),
397369

398-
// TODO deduplicate this code
399370
// c-string literal, raw c-string literal or identifier.
400-
'c' => match (self.first(), self.second()) {
401-
('"', _) => {
402-
self.bump();
403-
let terminated = self.double_quoted_string();
404-
let suffix_start = self.pos_within_token();
405-
if terminated {
406-
self.eat_literal_suffix();
407-
}
408-
let kind = CStr { terminated };
409-
Literal { kind, suffix_start }
410-
}
411-
('r', '"') | ('r', '#') => {
412-
self.bump();
413-
let res = self.raw_double_quoted_string(2);
414-
let suffix_start = self.pos_within_token();
415-
if res.is_ok() {
416-
self.eat_literal_suffix();
417-
}
418-
let kind = RawCStr { n_hashes: res.ok() };
419-
Literal { kind, suffix_start }
420-
}
421-
_ => self.ident_or_unknown_prefix(),
422-
},
371+
'c' => self.c_or_byte_string(
372+
|terminated| CStr { terminated },
373+
|n_hashes| RawCStr { n_hashes },
374+
None,
375+
),
423376

424377
// Identifier (this should be checked after other variant that can
425378
// start as identifier).
@@ -583,6 +536,47 @@ impl Cursor<'_> {
583536
}
584537
}
585538

539+
fn c_or_byte_string(
540+
&mut self,
541+
mk_kind: impl FnOnce(bool) -> LiteralKind,
542+
mk_kind_raw: impl FnOnce(Option<u8>) -> LiteralKind,
543+
single_quoted: Option<fn(bool) -> LiteralKind>,
544+
) -> TokenKind {
545+
match (self.first(), self.second(), single_quoted) {
546+
('\'', _, Some(mk_kind)) => {
547+
self.bump();
548+
let terminated = self.single_quoted_string();
549+
let suffix_start = self.pos_within_token();
550+
if terminated {
551+
self.eat_literal_suffix();
552+
}
553+
let kind = mk_kind(terminated);
554+
Literal { kind, suffix_start }
555+
}
556+
('"', _, _) => {
557+
self.bump();
558+
let terminated = self.double_quoted_string();
559+
let suffix_start = self.pos_within_token();
560+
if terminated {
561+
self.eat_literal_suffix();
562+
}
563+
let kind = mk_kind(terminated);
564+
Literal { kind, suffix_start }
565+
}
566+
('r', '"', _) | ('r', '#', _) => {
567+
self.bump();
568+
let res = self.raw_double_quoted_string(2);
569+
let suffix_start = self.pos_within_token();
570+
if res.is_ok() {
571+
self.eat_literal_suffix();
572+
}
573+
let kind = mk_kind_raw(res.ok());
574+
Literal { kind, suffix_start }
575+
}
576+
_ => self.ident_or_unknown_prefix(),
577+
}
578+
}
579+
586580
fn number(&mut self, first_digit: char) -> LiteralKind {
587581
debug_assert!('0' <= self.prev() && self.prev() <= '9');
588582
let mut base = Base::Decimal;

‎library/proc_macro/src/bridge/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ pub enum LitKind {
337337
StrRaw(u8),
338338
ByteStr,
339339
ByteStrRaw(u8),
340+
CStr,
341+
CStrRaw(u8),
340342
Err,
341343
}
342344

@@ -350,6 +352,8 @@ rpc_encode_decode!(
350352
StrRaw(n),
351353
ByteStr,
352354
ByteStrRaw(n),
355+
CStr,
356+
CStrRaw(n),
353357
Err,
354358
}
355359
);

‎tests/ui/rfcs/rfc-3348-c-string-literals/gate.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// gate-test-c_str_literals
2+
3+
macro_rules! m {
4+
($t:tt) => {}
5+
}
6+
17
fn main() {
28
c"foo";
39
//~^ ERROR: `c".."` literals are experimental

0 commit comments

Comments
 (0)