Skip to content

minor: sync from downstream #18317

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

Merged
merged 21 commits into from
Oct 17, 2024
Merged

minor: sync from downstream #18317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0746cb0
Auto merge of #131399 - lnicola:sync-from-ra, r=lnicola
bors Oct 8, 2024
c0c2f69
Auto merge of #131404 - matthiaskrgr:rollup-z0dawoo, r=matthiaskrgr
bors Oct 8, 2024
c54c798
Auto merge of #122709 - onur-ozkan:use-precompiled-rustc-by-default, …
bors Oct 8, 2024
6e4b1ef
Auto merge of #131155 - jieyouxu:always-kill, r=onur-ozkan
bors Oct 8, 2024
ec11c27
Reserve guarded string literals (RFC 3593)
pitaj Apr 14, 2024
48083d5
Rollup merge of #123951 - pitaj:reserve-guarded-strings, r=traviscross
matthiaskrgr Oct 9, 2024
9080e9f
Rollup merge of #130827 - fmease:library-mv-obj-save-dyn-compat, r=ib…
matthiaskrgr Oct 9, 2024
7fa18b6
Rollup merge of #131383 - AngelicosPhosphoros:better_doc_for_slice_sl…
matthiaskrgr Oct 9, 2024
0fb8402
Rollup merge of #131403 - practicalrs:fix_needless_lifetimes_p2, r=pe…
matthiaskrgr Oct 9, 2024
9436c09
Rollup merge of #131417 - GuillaumeGomez:mobile-methods-left-margin, …
matthiaskrgr Oct 9, 2024
0eab180
Rollup merge of #131449 - nickrum:wasip2-net-decouple-fd, r=alexcrichton
matthiaskrgr Oct 9, 2024
e169449
Rollup merge of #131462 - cuviper:open_buffered-error, r=RalfJung
matthiaskrgr Oct 9, 2024
c07f824
Auto merge of #131466 - matthiaskrgr:rollup-3qtz83x, r=matthiaskrgr
bors Oct 10, 2024
43d42e7
Auto merge of #131453 - onur-ozkan:llvm-ci-check-for-rustc-ci, r=Kobzol
bors Oct 10, 2024
5c5a5b0
Auto merge of #131045 - compiler-errors:remove-unnamed_fields, r=wesl…
bors Oct 11, 2024
e15b6f9
Auto merge of #125679 - clarfonthey:escape_ascii, r=joboet
bors Oct 13, 2024
1b9e2cb
Auto merge of #126557 - GrigorenkoPV:vec_track_caller, r=joboet
bors Oct 14, 2024
848af21
Auto merge of #131460 - jwong101:default-placement-new, r=ibraheemdev
bors Oct 16, 2024
f3fad2a
Preparing for merge from rust-lang/rust
lnicola Oct 17, 2024
7ae97c1
Merge from rust-lang/rust
lnicola Oct 17, 2024
2fe603e
Bump rustc crates
lnicola Oct 17, 2024
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
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ tt = { path = "./crates/tt", version = "0.0.0" }
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }

ra-ap-rustc_lexer = { version = "0.68.0", default-features = false }
ra-ap-rustc_parse_format = { version = "0.68.0", default-features = false }
ra-ap-rustc_index = { version = "0.68.0", default-features = false }
ra-ap-rustc_abi = { version = "0.68.0", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.68.0", default-features = false }
ra-ap-rustc_lexer = { version = "0.71.0", default-features = false }
ra-ap-rustc_parse_format = { version = "0.71.0", default-features = false }
ra-ap-rustc_index = { version = "0.71.0", default-features = false }
ra-ap-rustc_abi = { version = "0.71.0", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.71.0", default-features = false }

# local crates that aren't published to crates.io. These should not have versions.
test-fixture = { path = "./crates/test-fixture" }
Expand Down
7 changes: 7 additions & 0 deletions crates/parser/src/lexed_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,13 @@ impl<'a> Converter<'a> {
}

rustc_lexer::TokenKind::RawIdent => IDENT,

rustc_lexer::TokenKind::GuardedStrPrefix if self.edition.at_least_2024() => {
err = "Invalid string literal (reserved syntax)";
ERROR
}
rustc_lexer::TokenKind::GuardedStrPrefix => POUND,

rustc_lexer::TokenKind::Literal { kind, .. } => {
self.extend_literal(token_text.len(), kind);
return;
Expand Down
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cf24c73141a77db730f4b7fda69dcd7e8b113b51
dd5127615ad626741a1116d022cf784637ac05df