Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 20d04d8

Browse files
committed
Revert "Rollup merge of rust-lang#136355 - GuillaumeGomez:proc-macro_add_value_retrieval_methods, r=Amanieu"
This reverts commit 08dfbf4, reversing changes made to 10bcdad.
1 parent 75530e9 commit 20d04d8

File tree

27 files changed

+15
-253
lines changed

27 files changed

+15
-253
lines changed

Cargo.lock

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,13 +2082,6 @@ version = "0.7.4"
20822082
source = "registry+https://github.com/rust-lang/crates.io-index"
20832083
checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
20842084

2085-
[[package]]
2086-
name = "literal-escaper"
2087-
version = "0.0.0"
2088-
dependencies = [
2089-
"rustc-std-workspace-std 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
2090-
]
2091-
20922085
[[package]]
20932086
name = "lld-wrapper"
20942087
version = "0.1.0"
@@ -3155,12 +3148,6 @@ version = "1.0.1"
31553148
name = "rustc-std-workspace-std"
31563149
version = "1.0.1"
31573150

3158-
[[package]]
3159-
name = "rustc-std-workspace-std"
3160-
version = "1.0.1"
3161-
source = "registry+https://github.com/rust-lang/crates.io-index"
3162-
checksum = "aba676a20abe46e5b0f1b0deae474aaaf31407e6c71147159890574599da04ef"
3163-
31643151
[[package]]
31653152
name = "rustc_abi"
31663153
version = "0.0.0"
@@ -3199,7 +3186,6 @@ name = "rustc_ast"
31993186
version = "0.0.0"
32003187
dependencies = [
32013188
"bitflags",
3202-
"literal-escaper",
32033189
"memchr",
32043190
"rustc_ast_ir",
32053191
"rustc_data_structures",
@@ -3909,7 +3895,6 @@ name = "rustc_lexer"
39093895
version = "0.0.0"
39103896
dependencies = [
39113897
"expect-test",
3912-
"literal-escaper",
39133898
"memchr",
39143899
"unicode-properties",
39153900
"unicode-xid",
@@ -4172,7 +4157,6 @@ name = "rustc_parse"
41724157
version = "0.0.0"
41734158
dependencies = [
41744159
"bitflags",
4175-
"literal-escaper",
41764160
"rustc_ast",
41774161
"rustc_ast_pretty",
41784162
"rustc_data_structures",
@@ -4195,7 +4179,6 @@ dependencies = [
41954179
name = "rustc_parse_format"
41964180
version = "0.0.0"
41974181
dependencies = [
4198-
"literal-escaper",
41994182
"rustc_index",
42004183
"rustc_lexer",
42014184
]

compiler/rustc_ast/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ edition = "2024"
66
[dependencies]
77
# tidy-alphabetical-start
88
bitflags = "2.4.1"
9-
literal-escaper = { path = "../../library/literal-escaper" }
109
memchr = "2.7.4"
1110
rustc_ast_ir = { path = "../rustc_ast_ir" }
1211
rustc_data_structures = { path = "../rustc_data_structures" }

compiler/rustc_ast/src/util/literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use std::{ascii, fmt, str};
44

5-
use literal_escaper::{
5+
use rustc_lexer::unescape::{
66
MixedUnit, Mode, byte_from_char, unescape_byte, unescape_char, unescape_mixed, unescape_unicode,
77
};
88
use rustc_span::{Span, Symbol, kw, sym};

compiler/rustc_lexer/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Rust lexer used by rustc. No stability guarantees are provided.
1616
[dependencies]
1717
memchr = "2.7.4"
1818
unicode-xid = "0.2.0"
19-
literal-escaper = { path = "../../library/literal-escaper" }
2019

2120
[dependencies.unicode-properties]
2221
version = "0.1.0"

compiler/rustc_lexer/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@
2626
// tidy-alphabetical-end
2727

2828
mod cursor;
29+
pub mod unescape;
2930

3031
#[cfg(test)]
3132
mod tests;
3233

33-
// FIXME: This is needed for rust-analyzer. Remove this dependency once rust-analyzer uses
34-
// `literal-escaper`.
35-
pub use literal_escaper as unescape;
3634
use unicode_properties::UnicodeEmoji;
3735
pub use unicode_xid::UNICODE_VERSION as UNICODE_XID_VERSION;
3836

compiler/rustc_parse/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ edition = "2024"
66
[dependencies]
77
# tidy-alphabetical-start
88
bitflags = "2.4.1"
9-
literal-escaper = { path = "../../library/literal-escaper" }
109
rustc_ast = { path = "../rustc_ast" }
1110
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1211
rustc_data_structures = { path = "../rustc_data_structures" }

compiler/rustc_parse/src/lexer/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use std::ops::Range;
22

3-
use literal_escaper::{self, EscapeError, Mode};
43
use rustc_ast::ast::{self, AttrStyle};
54
use rustc_ast::token::{self, CommentKind, Delimiter, IdentIsRaw, Token, TokenKind};
65
use rustc_ast::tokenstream::TokenStream;
76
use rustc_ast::util::unicode::contains_text_flow_control_chars;
87
use rustc_errors::codes::*;
98
use rustc_errors::{Applicability, Diag, DiagCtxtHandle, StashKey};
9+
use rustc_lexer::unescape::{self, EscapeError, Mode};
1010
use rustc_lexer::{Base, Cursor, DocStyle, LiteralKind, RawStrError};
1111
use rustc_session::lint::BuiltinLintDiag;
1212
use rustc_session::lint::builtin::{
@@ -970,7 +970,7 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
970970
postfix_len: u32,
971971
) -> (token::LitKind, Symbol) {
972972
self.cook_common(kind, mode, start, end, prefix_len, postfix_len, |src, mode, callback| {
973-
literal_escaper::unescape_unicode(src, mode, &mut |span, result| {
973+
unescape::unescape_unicode(src, mode, &mut |span, result| {
974974
callback(span, result.map(drop))
975975
})
976976
})
@@ -986,7 +986,7 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
986986
postfix_len: u32,
987987
) -> (token::LitKind, Symbol) {
988988
self.cook_common(kind, mode, start, end, prefix_len, postfix_len, |src, mode, callback| {
989-
literal_escaper::unescape_mixed(src, mode, &mut |span, result| {
989+
unescape::unescape_mixed(src, mode, &mut |span, result| {
990990
callback(span, result.map(drop))
991991
})
992992
})

compiler/rustc_parse/src/lexer/unescape_error_reporting.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use std::iter::once;
44
use std::ops::Range;
55

6-
use literal_escaper::{EscapeError, Mode};
76
use rustc_errors::{Applicability, DiagCtxtHandle, ErrorGuaranteed};
7+
use rustc_lexer::unescape::{EscapeError, Mode};
88
use rustc_span::{BytePos, Span};
99
use tracing::debug;
1010

0 commit comments

Comments
 (0)