diff options
| author | bors <bors@rust-lang.org> | 2024-02-18 17:13:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-18 17:13:20 +0000 |
| commit | 14924b03ce5dd9b64cebc5c06a7484ea6516f9ac (patch) | |
| tree | e2e91587bee0e5490a2d9b6ddcf1d8549ee51c69 | |
| parent | ac998a74b3c8ff4b81c3eeb9a18811d4cc76226d (diff) | |
| parent | 3aaaa1409fc1d0ac08ef2cd3b9d28bf9e2dd4885 (diff) | |
| download | rust-14924b03ce5dd9b64cebc5c06a7484ea6516f9ac.tar.gz rust-14924b03ce5dd9b64cebc5c06a7484ea6516f9ac.zip | |
Auto merge of #16597 - lnicola:sync-from-rust, r=lnicola
internal: Sync from downstream
| -rw-r--r-- | crates/hir-def/src/attr/builtin.rs | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/server/rust_analyzer_span.rs | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/server/token_id.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir-def/src/attr/builtin.rs b/crates/hir-def/src/attr/builtin.rs index b20ee9e5bf6..55b9a1dfdcb 100644 --- a/crates/hir-def/src/attr/builtin.rs +++ b/crates/hir-def/src/attr/builtin.rs @@ -650,7 +650,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ rustc_attr!(TEST, rustc_regions, Normal, template!(Word), WarnFollowing), rustc_attr!( TEST, rustc_error, Normal, - template!(Word, List: "span_delayed_bug_from_inside_query"), WarnFollowingWordOnly + template!(Word, List: "delayed_bug_from_inside_query"), WarnFollowingWordOnly ), rustc_attr!(TEST, rustc_dump_user_args, Normal, template!(Word), WarnFollowing), rustc_attr!(TEST, rustc_evaluate_where_clauses, Normal, template!(Word), WarnFollowing), diff --git a/crates/proc-macro-srv/src/server/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server/rust_analyzer_span.rs index 17159ffbb88..c6a0a666555 100644 --- a/crates/proc-macro-srv/src/server/rust_analyzer_span.rs +++ b/crates/proc-macro-srv/src/server/rust_analyzer_span.rs @@ -249,7 +249,7 @@ impl server::TokenStream for RaSpanServer { tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => { bridge::TokenTree::Literal(bridge::Literal { // FIXME: handle literal kinds - kind: bridge::LitKind::Err, + kind: bridge::LitKind::Integer, // dummy symbol: Symbol::intern(self.interner, &lit.text), // FIXME: handle suffixes suffix: None, diff --git a/crates/proc-macro-srv/src/server/token_id.rs b/crates/proc-macro-srv/src/server/token_id.rs index eddd6b1e6b9..7e9d8057ac9 100644 --- a/crates/proc-macro-srv/src/server/token_id.rs +++ b/crates/proc-macro-srv/src/server/token_id.rs @@ -234,7 +234,7 @@ impl server::TokenStream for TokenIdServer { tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => { bridge::TokenTree::Literal(bridge::Literal { // FIXME: handle literal kinds - kind: bridge::LitKind::Err, + kind: bridge::LitKind::Integer, // dummy symbol: Symbol::intern(self.interner, &lit.text), // FIXME: handle suffixes suffix: None, |