Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-10 12:18:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #121142 - GuillaumeGomez:rollup-5qmksjw, r=GuillaumeGomez

Browse source 
Rollup of 8 pull requests

Successful merges:

 - #120449 (Document requirements for unsized {Rc,Arc}::from_raw)
 - #120505 (Fix BTreeMap's Cursor::remove_{next,prev})
 - #120672 (std::thread update freebsd stack guard handling.)
 - #121088 (Implicitly enable evex512 if avx512 is enabled)
 - #121104 (Ignore unsized types when trying to determine the size of the original type)
 - #121107 (Fix msg for verbose suggestions with confusable capitalization)
 - #121113 (Continue compilation even if inherent impl checks fail)
 - #121120 (Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`.)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2024-02-15 17:00:55 +00:00
commit 6b6dc7bccf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ impl server::FreeFunctions for RaSpanServer {
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> { ) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
// FIXME: keep track of LitKind and Suffix // FIXME: keep track of LitKind and Suffix
Ok(bridge::Literal { Ok(bridge::Literal {
kind: bridge::LitKind::Err, kind: bridge::LitKind::Integer, // dummy
symbol: Symbol::intern(self.interner, s), symbol: Symbol::intern(self.interner, s),
suffix: None, suffix: None,
span: self.call_site, span: self.call_site,
@ -202,7 +202,7 @@ impl server::TokenStream for RaSpanServer {
tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => { tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
bridge::TokenTree::Literal(bridge::Literal { bridge::TokenTree::Literal(bridge::Literal {
// FIXME: handle literal kinds // FIXME: handle literal kinds
kind: bridge::LitKind::Err, kind: bridge::LitKind::Integer, // dummy
symbol: Symbol::intern(self.interner, &lit.text), symbol: Symbol::intern(self.interner, &lit.text),
// FIXME: handle suffixes // FIXME: handle suffixes
suffix: None, suffix: None,

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

@ -64,7 +64,7 @@ impl server::FreeFunctions for TokenIdServer {
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> { ) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
// FIXME: keep track of LitKind and Suffix // FIXME: keep track of LitKind and Suffix
Ok(bridge::Literal { Ok(bridge::Literal {
kind: bridge::LitKind::Err, kind: bridge::LitKind::Integer, // dummy
symbol: Symbol::intern(self.interner, s), symbol: Symbol::intern(self.interner, s),
suffix: None, suffix: None,
span: self.call_site, span: self.call_site,
@ -187,7 +187,7 @@ impl server::TokenStream for TokenIdServer {
tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => { tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
bridge::TokenTree::Literal(bridge::Literal { bridge::TokenTree::Literal(bridge::Literal {
// FIXME: handle literal kinds // FIXME: handle literal kinds
kind: bridge::LitKind::Err, kind: bridge::LitKind::Integer, // dummy
symbol: Symbol::intern(self.interner, &lit.text), symbol: Symbol::intern(self.interner, &lit.text),
// FIXME: handle suffixes // FIXME: handle suffixes
suffix: None, suffix: None,