Merge #6485

6485: Remove RAW literals r=matklad a=matklad

bors r+
🤖

closes https://github.com/rust-analyzer/rust-analyzer/issues/6308

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 2 insertions, 5 deletions

diff --git a/crates/ide/src/syntax_highlighting/format.rs b/crates/ide/src/syntax_highlighting/format.rs
index 71bde24f0..42f27df5d 100644
--- a/crates/ide/src/syntax_highlighting/format.rs
+++ b/crates/ide/src/syntax_highlighting/format.rs
@@ -29,9 +29,7 @@ impl FormatStringHighlighter {
                         .children_with_tokens()
                         .filter(|t| t.kind() != SyntaxKind::WHITESPACE)
                         .nth(1)
-                        .filter(|e| {
-                            ast::String::can_cast(e.kind()) || ast::RawString::can_cast(e.kind())
-                        })
+                        .filter(|e| ast::String::can_cast(e.kind()))
                 }
                 _ => {}
             }
diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs
index 59a74bc02..e97d1be1a 100644
--- a/crates/ide/src/syntax_highlighting/injection.rs
+++ b/crates/ide/src/syntax_highlighting/injection.rs
@@ -2,7 +2,6 @@
 
 use std::{collections::BTreeMap, convert::TryFrom};
 
-use ast::{HasQuotes, HasStringValue};
 use hir::Semantics;
 use ide_db::call_info::ActiveParameter;
 use itertools::Itertools;
@@ -15,7 +14,7 @@ use super::HighlightedRangeStack;
 pub(super) fn highlight_injection(
     acc: &mut HighlightedRangeStack,
     sema: &Semantics<RootDatabase>,
-    literal: ast::RawString,
+    literal: ast::String,
     expanded: SyntaxToken,
 ) -> Option<()> {
     let active_parameter = ActiveParameter::at_token(&sema, expanded)?;