Skip to content

Rollup of 5 pull requests #95322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Rollup of 5 pull requests #95322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
056951d
Take &mut Diagnostic in emit_diagnostic.
cjgillot Mar 20, 2022
0b49d05
Filter OnceNote in diagnostic infra.
cjgillot Mar 20, 2022
c544f10
Deduplicate ui-fulldeps.
cjgillot Mar 20, 2022
38e0ae5
Reduce max hash in raw strings from u16 to u8
GrishaVar Mar 23, 2022
b51f20e
Update syntax tree definition
GrishaVar Mar 23, 2022
32b2a19
Fix inaccurate function name in `rustc_const_eval` docs
pierwill Mar 24, 2022
335d196
Remove hermitkernel targets
mkroening Mar 25, 2022
f7d5b7a
Bless rustdoc tests.
cjgillot Mar 25, 2022
8c0e6a8
std::process docs: linkify references to output, spawn and status
est31 Mar 25, 2022
663f1b8
Rollup merge of #95149 - cjgillot:once-diag, r=estebank
Dylan-DPC Mar 26, 2022
5aac762
Rollup merge of #95251 - GrishaVar:hashes-u16-to-u8, r=nnethercote
Dylan-DPC Mar 26, 2022
79c5bed
Rollup merge of #95281 - pierwill:fix-85513, r=Dylan-DPC
Dylan-DPC Mar 26, 2022
baae344
Rollup merge of #95299 - mkroening:rm-hermitkernel, r=joshtriplett
Dylan-DPC Mar 26, 2022
1a6ff67
Rollup merge of #95306 - est31:master, r=Dylan-DPC
Dylan-DPC Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update syntax tree definition
  • Loading branch information
@GrishaVar
GrishaVar committed Mar 23, 2022
commit b51f20eaf5cc311ca601643306ec2ee0c8a714e8
2 changes: 1 addition & 1 deletion compiler/rustc_ast/src/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ pub enum StrStyle {
/// A raw string, like `r##"foo"##`.
///
/// The value is the number of `#` symbols used.
Raw(u16),
Raw(u8),
}

/// An AST literal.
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_ast/src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ pub enum LitKind {
Integer,
Float,
Str,
StrRaw(u16), // raw string delimited by `n` hash symbols
StrRaw(u8), // raw string delimited by `n` hash symbols
ByteStr,
ByteStrRaw(u16), // raw byte string delimited by `n` hash symbols
ByteStrRaw(u8), // raw byte string delimited by `n` hash symbols
Err,
}

Expand Down