Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7f115e3

Browse files
committedSep 12, 2022
Auto merge of #101716 - Dylan-DPC:rollup-ayvh6nd, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #100293 (Add inline-llvm option for disabling/enabling LLVM inlining) - #100767 (Remove manual <[u8]>::escape_ascii) - #101668 (Suggest pub instead of public for const type item) - #101671 (Fix naming format of IEEE 754 standard) - #101676 (Check that the types in return position `impl Trait` in traits are well-formed) - #101681 (Deny return-position `impl Trait` in traits for object safety) - #101693 (Update browser UI test 0 10) - #101701 (Rustdoc-Json: Add tests for trait impls.) - #101706 (rustdoc: remove no-op `#search`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents a93214e + 9bf89e7 commit 7f115e3

File tree

41 files changed

+372
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+372
-105
lines changed
 

‎compiler/rustc_ast/src/token.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ impl Token {
473473
kw::Extern,
474474
kw::Impl,
475475
kw::Unsafe,
476+
kw::Const,
476477
kw::Static,
477478
kw::Union,
478479
kw::Macro,

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,7 @@ impl LitKind {
163163
}
164164
LitKind::Str(symbol, ast::StrStyle::Raw(n)) => (token::StrRaw(n), symbol, None),
165165
LitKind::ByteStr(ref bytes) => {
166-
let string = bytes
167-
.iter()
168-
.cloned()
169-
.flat_map(ascii::escape_default)
170-
.map(Into::<char>::into)
171-
.collect::<String>();
166+
let string = bytes.escape_ascii().to_string();
172167
(token::ByteStr, Symbol::intern(&string), None)
173168
}
174169
LitKind::Byte(byte) => {

0 commit comments

Comments
 (0)
Please sign in to comment.