language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-04 10:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Auto merge of #14980 - lnicola:sync-from-rust, r=lnicola

Browse source 
Sync from downstream
This commit is contained in:
bors 2023-06-05 08:33:53 +00:00
commit aa9bc86125
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir-def/src/attr/builtin.rs
View file

@ -200,10 +200,6 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
// Limits: // Limits:
ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing), ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing),
ungated!(type_length_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing), ungated!(type_length_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing),
gated!(
const_eval_limit, CrateLevel, template!(NameValueStr: "N"), ErrorFollowing,
const_eval_limit, experimental!(const_eval_limit)
),
gated!( gated!(
move_size_limit, CrateLevel, template!(NameValueStr: "N"), ErrorFollowing, move_size_limit, CrateLevel, template!(NameValueStr: "N"), ErrorFollowing,
large_assignments, experimental!(move_size_limit) large_assignments, experimental!(move_size_limit)

10
crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs
View file

@ -201,7 +201,7 @@ macro_rules! format_args {
} }
fn main() { fn main() {
::core::fmt::Arguments::new_v1(&["", " ", ], &[::core::fmt::ArgumentV1::new(&(arg1(a, b, c)), ::core::fmt::Display::fmt), ::core::fmt::ArgumentV1::new(&(arg2), ::core::fmt::Debug::fmt), ]); ::core::fmt::Arguments::new_v1(&["", " ", ], &[::core::fmt::Argument::new(&(arg1(a, b, c)), ::core::fmt::Display::fmt), ::core::fmt::Argument::new(&(arg2), ::core::fmt::Debug::fmt), ]);
} }
"##]], "##]],
); );
@ -229,7 +229,7 @@ macro_rules! format_args {
} }
fn main() { fn main() {
::core::fmt::Arguments::new_v1(&["", " ", ], &[::core::fmt::ArgumentV1::new(&(a::<A, B>()), ::core::fmt::Display::fmt), ::core::fmt::ArgumentV1::new(&(b), ::core::fmt::Debug::fmt), ]); ::core::fmt::Arguments::new_v1(&["", " ", ], &[::core::fmt::Argument::new(&(a::<A, B>()), ::core::fmt::Display::fmt), ::core::fmt::Argument::new(&(b), ::core::fmt::Debug::fmt), ]);
} }
"##]], "##]],
); );
@ -262,7 +262,7 @@ macro_rules! format_args {
} }
fn main() { fn main() {
::core::fmt::Arguments::new_v1(&[r#""#, r#",mismatch,""#, r#"",""#, r#"""#, ], &[::core::fmt::ArgumentV1::new(&(location_csv_pat(db, &analysis, vfs, &sm, pat_id)), ::core::fmt::Display::fmt), ::core::fmt::ArgumentV1::new(&(mismatch.expected.display(db)), ::core::fmt::Display::fmt), ::core::fmt::ArgumentV1::new(&(mismatch.actual.display(db)), ::core::fmt::Display::fmt), ]); ::core::fmt::Arguments::new_v1(&[r#""#, r#",mismatch,""#, r#"",""#, r#"""#, ], &[::core::fmt::Argument::new(&(location_csv_pat(db, &analysis, vfs, &sm, pat_id)), ::core::fmt::Display::fmt), ::core::fmt::Argument::new(&(mismatch.expected.display(db)), ::core::fmt::Display::fmt), ::core::fmt::Argument::new(&(mismatch.actual.display(db)), ::core::fmt::Display::fmt), ]);
} }
"##]], "##]],
); );
@ -296,7 +296,7 @@ macro_rules! format_args {
} }
fn main() { fn main() {
::core::fmt::Arguments::new_v1(&["xxx", "y", "zzz", ], &[::core::fmt::ArgumentV1::new(&(2), ::core::fmt::Display::fmt), ::core::fmt::ArgumentV1::new(&(b), ::core::fmt::Debug::fmt), ]); ::core::fmt::Arguments::new_v1(&["xxx", "y", "zzz", ], &[::core::fmt::Argument::new(&(2), ::core::fmt::Display::fmt), ::core::fmt::Argument::new(&(b), ::core::fmt::Debug::fmt), ]);
} }
"##]], "##]],
); );
@ -327,7 +327,7 @@ macro_rules! format_args {
fn main() { fn main() {
let _ = let _ =
/* error: no rule matches input tokens *//* parse error: expected field name or number */ /* error: no rule matches input tokens *//* parse error: expected field name or number */
::core::fmt::Arguments::new_v1(&["", " ", ], &[::core::fmt::ArgumentV1::new(&(a.), ::core::fmt::Display::fmt), ::core::fmt::ArgumentV1::new(&(), ::core::fmt::Debug::fmt), ]); ::core::fmt::Arguments::new_v1(&["", " ", ], &[::core::fmt::Argument::new(&(a.), ::core::fmt::Display::fmt), ::core::fmt::Argument::new(&(), ::core::fmt::Debug::fmt), ]);
} }
"##]], "##]],
); );

2
crates/hir-expand/src/builtin_fn_macro.rs
View file

@ -370,7 +370,7 @@ fn format_args_expand_general(
quote!(::core::fmt::Display::fmt) quote!(::core::fmt::Display::fmt)
} }
}; };
arg_tts.push(quote! { ::core::fmt::ArgumentV1::new(&(#arg_tree), #formatter), }); arg_tts.push(quote! { ::core::fmt::Argument::new(&(#arg_tree), #formatter), });
} }
'}' => { '}' => {
if format_iter.peek() == Some(&'}') { if format_iter.peek() == Some(&'}') {

2
crates/proc-macro-api/src/version.rs
View file

@ -122,7 +122,7 @@ pub fn read_version(dylib_path: &AbsPath) -> io::Result<String> {
// https://github.com/rust-lang/rust/commit/0696e79f2740ad89309269b460579e548a5cd632 // https://github.com/rust-lang/rust/commit/0696e79f2740ad89309269b460579e548a5cd632
let snappy_portion = match version { let snappy_portion = match version {
5 | 6 => &dot_rustc[8..], 5 | 6 => &dot_rustc[8..],
7 => { 7 | 8 => {
let len_bytes = &dot_rustc[8..12]; let len_bytes = &dot_rustc[8..12];
let data_len = u32::from_be_bytes(len_bytes.try_into().unwrap()) as usize; let data_len = u32::from_be_bytes(len_bytes.try_into().unwrap()) as usize;
&dot_rustc[12..data_len + 12] &dot_rustc[12..data_len + 12]

6
crates/proc-macro-srv/src/server.rs
View file

@ -20,7 +20,7 @@ use token_stream::TokenStreamBuilder;
mod symbol; mod symbol;
pub use symbol::*; pub use symbol::*;
use std::ops::Bound; use std::ops::{Bound, Range};
use crate::tt; use crate::tt;
@ -300,6 +300,10 @@ impl server::Span for RustAnalyzer {
// FIXME handle span // FIXME handle span
span span
} }
fn byte_range(&mut self, _span: Self::Span) -> Range<usize> {
// FIXME handle span
Range { start: 0, end: 0 }
}
fn start(&mut self, _span: Self::Span) -> LineColumn { fn start(&mut self, _span: Self::Span) -> LineColumn {
// FIXME handle span // FIXME handle span
LineColumn { line: 0, column: 0 } LineColumn { line: 0, column: 0 }