30 files changed, 127 insertions, 50 deletions

diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs
index 508ac37c2..c5cf803fd 100644
--- a/crates/hir/src/display.rs
+++ b/crates/hir/src/display.rs
@@ -92,7 +92,7 @@ impl HirDisplay for Function {
             &data.ret_type
         } else {
             match &*data.ret_type {
-                TypeRef::ImplTrait(bounds) => match &bounds[0] {
+                TypeRef::ImplTrait(bounds) => match bounds[0].as_ref() {
                     TypeBound::Path(path) => {
                         path.segments().iter().last().unwrap().args_and_bindings.unwrap().bindings
                             [0]
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs
index 135a6698e..8bcac60ef 100644
--- a/crates/hir_def/src/data.rs
+++ b/crates/hir_def/src/data.rs
@@ -112,7 +112,7 @@ pub struct TypeAliasData {
     pub visibility: RawVisibility,
     pub is_extern: bool,
     /// Bounds restricting the type alias itself (eg. `type Ty: Bound;` in a trait or impl).
-    pub bounds: Vec<TypeBound>,
+    pub bounds: Vec<Interned<TypeBound>>,
 }
 
 impl TypeAliasData {
@@ -141,7 +141,7 @@ pub struct TraitData {
     pub is_auto: bool,
     pub is_unsafe: bool,
     pub visibility: RawVisibility,
-    pub bounds: Box<[TypeBound]>,
+    pub bounds: Box<[Interned<TypeBound>]>,
 }
 
 impl TraitData {
diff --git a/crates/hir_def/src/generics.rs b/crates/hir_def/src/generics.rs
index de5acced8..44d22b918 100644
--- a/crates/hir_def/src/generics.rs
+++ b/crates/hir_def/src/generics.rs
@@ -68,9 +68,19 @@ pub struct GenericParams {
 /// associated type bindings like `Iterator<Item = u32>`.
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub enum WherePredicate {
-    TypeBound { target: WherePredicateTypeTarget, bound: TypeBound },
-    Lifetime { target: LifetimeRef, bound: LifetimeRef },
-    ForLifetime { lifetimes: Box<[Name]>, target: WherePredicateTypeTarget, bound: TypeBound },
+    TypeBound {
+        target: WherePredicateTypeTarget,
+        bound: Interned<TypeBound>,
+    },
+    Lifetime {
+        target: LifetimeRef,
+        bound: LifetimeRef,
+    },
+    ForLifetime {
+        lifetimes: Box<[Name]>,
+        target: WherePredicateTypeTarget,
+        bound: Interned<TypeBound>,
+    },
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
@@ -339,11 +349,11 @@ impl GenericParams {
                 Some(hrtb_lifetimes) => WherePredicate::ForLifetime {
                     lifetimes: hrtb_lifetimes.clone(),
                     target: WherePredicateTypeTarget::TypeRef(Interned::new(type_ref)),
-                    bound,
+                    bound: Interned::new(bound),
                 },
                 None => WherePredicate::TypeBound {
                     target: WherePredicateTypeTarget::TypeRef(Interned::new(type_ref)),
-                    bound,
+                    bound: Interned::new(bound),
                 },
             },
             (Either::Right(lifetime), TypeBound::Lifetime(bound)) => {
diff --git a/crates/hir_def/src/intern.rs b/crates/hir_def/src/intern.rs
index 5cc7f2df6..1189c9327 100644
--- a/crates/hir_def/src/intern.rs
+++ b/crates/hir_def/src/intern.rs
@@ -216,7 +216,9 @@ pub use crate::_impl_internable as impl_internable;
 impl_internable!(
     crate::type_ref::TypeRef,
     crate::type_ref::TraitRef,
+    crate::type_ref::TypeBound,
     crate::path::ModPath,
+    crate::path::GenericArgs,
     GenericParams,
     str,
 );
diff --git a/crates/hir_def/src/item_tree.rs b/crates/hir_def/src/item_tree.rs
index 4a5f44027..11767d100 100644
--- a/crates/hir_def/src/item_tree.rs
+++ b/crates/hir_def/src/item_tree.rs
@@ -644,7 +644,7 @@ pub struct Trait {
     pub generic_params: Interned<GenericParams>,
     pub is_auto: bool,
     pub is_unsafe: bool,
-    pub bounds: Box<[TypeBound]>,
+    pub bounds: Box<[Interned<TypeBound>]>,
     pub items: Box<[AssocItem]>,
     pub ast_id: FileAstId<ast::Trait>,
 }
@@ -664,7 +664,7 @@ pub struct TypeAlias {
     pub name: Name,
     pub visibility: RawVisibilityId,
     /// Bounds on the type alias itself. Only valid in trait declarations, eg. `type Assoc: Copy;`.
-    pub bounds: Box<[TypeBound]>,
+    pub bounds: Box<[Interned<TypeBound>]>,
     pub generic_params: Interned<GenericParams>,
     pub type_ref: Option<Interned<TypeRef>>,
     pub is_extern: bool,
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index 91cf75371..b4389371f 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -384,7 +384,7 @@ impl<'a> Ctx<'a> {
 
         let ret_type = if func.async_token().is_some() {
             let future_impl = desugar_future_path(ret_type);
-            let ty_bound = TypeBound::Path(future_impl);
+            let ty_bound = Interned::new(TypeBound::Path(future_impl));
             TypeRef::ImplTrait(vec![ty_bound])
         } else {
             ret_type
@@ -738,11 +738,12 @@ impl<'a> Ctx<'a> {
         Interned::new(generics)
     }
 
-    fn lower_type_bounds(&mut self, node: &impl ast::TypeBoundsOwner) -> Vec<TypeBound> {
+    fn lower_type_bounds(&mut self, node: &impl ast::TypeBoundsOwner) -> Vec<Interned<TypeBound>> {
         match node.type_bound_list() {
-            Some(bound_list) => {
-                bound_list.bounds().map(|it| TypeBound::from_ast(&self.body_ctx, it)).collect()
-            }
+            Some(bound_list) => bound_list
+                .bounds()
+                .map(|it| Interned::new(TypeBound::from_ast(&self.body_ctx, it)))
+                .collect(),
             None => Vec::new(),
         }
     }
@@ -810,7 +811,7 @@ fn desugar_future_path(orig: TypeRef) -> Path {
     let binding =
         AssociatedTypeBinding { name: name![Output], type_ref: Some(orig), bounds: Vec::new() };
     last.bindings.push(binding);
-    generic_args.push(Some(Arc::new(last)));
+    generic_args.push(Some(Interned::new(last)));
 
     Path::from_known_path(path, generic_args)
 }
diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs
index 4bc87a0e2..9394a5de6 100644
--- a/crates/hir_def/src/item_tree/pretty.rs
+++ b/crates/hir_def/src/item_tree/pretty.rs
@@ -513,13 +513,13 @@ impl<'a> Printer<'a> {
         }
     }
 
-    fn print_type_bounds(&mut self, bounds: &[TypeBound]) {
+    fn print_type_bounds(&mut self, bounds: &[Interned<TypeBound>]) {
         for (i, bound) in bounds.iter().enumerate() {
             if i != 0 {
                 w!(self, " + ");
             }
 
-            match bound {
+            match bound.as_ref() {
                 TypeBound::Path(path) => self.print_path(path),
                 TypeBound::Lifetime(lt) => w!(self, "{}", lt.name),
                 TypeBound::Error => w!(self, "{{unknown}}"),
diff --git a/crates/hir_def/src/path.rs b/crates/hir_def/src/path.rs
index 9b8873fd2..45ab9d0ff 100644
--- a/crates/hir_def/src/path.rs
+++ b/crates/hir_def/src/path.rs
@@ -4,7 +4,6 @@ mod lower;
 use std::{
     fmt::{self, Display},
     iter,
-    sync::Arc,
 };
 
 use crate::{body::LowerCtx, db::DefDatabase, intern::Interned, type_ref::LifetimeRef};
@@ -136,7 +135,7 @@ pub struct Path {
     type_anchor: Option<Interned<TypeRef>>,
     mod_path: Interned<ModPath>,
     /// Invariant: the same len as `self.mod_path.segments`
-    generic_args: Vec<Option<Arc<GenericArgs>>>,
+    generic_args: Vec<Option<Interned<GenericArgs>>>,
 }
 
 /// Generic arguments to a path segment (e.g. the `i32` in `Option<i32>`). This
@@ -165,7 +164,7 @@ pub struct AssociatedTypeBinding {
     /// Bounds for the associated type, like in `Iterator<Item:
     /// SomeOtherTrait>`. (This is the unstable `associated_type_bounds`
     /// feature.)
-    pub bounds: Vec<TypeBound>,
+    pub bounds: Vec<Interned<TypeBound>>,
 }
 
 /// A single generic argument.
@@ -185,7 +184,7 @@ impl Path {
     /// Converts a known mod path to `Path`.
     pub(crate) fn from_known_path(
         path: ModPath,
-        generic_args: Vec<Option<Arc<GenericArgs>>>,
+        generic_args: Vec<Option<Interned<GenericArgs>>>,
     ) -> Path {
         Path { type_anchor: None, mod_path: Interned::new(path), generic_args }
     }
@@ -239,7 +238,7 @@ pub struct PathSegment<'a> {
 
 pub struct PathSegments<'a> {
     segments: &'a [Name],
-    generic_args: &'a [Option<Arc<GenericArgs>>],
+    generic_args: &'a [Option<Interned<GenericArgs>>],
 }
 
 impl<'a> PathSegments<'a> {
diff --git a/crates/hir_def/src/path/lower.rs b/crates/hir_def/src/path/lower.rs
index a873325b2..5d5dd9c8f 100644
--- a/crates/hir_def/src/path/lower.rs
+++ b/crates/hir_def/src/path/lower.rs
@@ -3,7 +3,6 @@
 mod lower_use;
 
 use crate::intern::Interned;
-use std::sync::Arc;
 
 use either::Either;
 use hir_expand::name::{name, AsName};
@@ -48,7 +47,7 @@ pub(super) fn lower_path(mut path: ast::Path, ctx: &LowerCtx) -> Option<Path> {
                                     segment.ret_type(),
                                 )
                             })
-                            .map(Arc::new);
+                            .map(Interned::new);
                         segments.push(name);
                         generic_args.push(args)
                     }
@@ -87,13 +86,13 @@ pub(super) fn lower_path(mut path: ast::Path, ctx: &LowerCtx) -> Option<Path> {
                         // Insert the type reference (T in the above example) as Self parameter for the trait
                         let last_segment =
                             generic_args.iter_mut().rev().nth(num_segments.saturating_sub(1))?;
-                        if last_segment.is_none() {
-                            *last_segment = Some(Arc::new(GenericArgs::empty()));
+                        let mut args_inner = match last_segment {
+                            Some(it) => it.as_ref().clone(),
+                            None => GenericArgs::empty(),
                         };
-                        let args = last_segment.as_mut().unwrap();
-                        let mut args_inner = Arc::make_mut(args);
                         args_inner.has_self_type = true;
                         args_inner.args.insert(0, GenericArg::Type(self_type));
+                        *last_segment = Some(Interned::new(args_inner));
                     }
                 }
             }
@@ -171,7 +170,9 @@ pub(super) fn lower_generic_args(
                     let name = name_ref.as_name();
                     let type_ref = assoc_type_arg.ty().map(|it| TypeRef::from_ast(lower_ctx, it));
                     let bounds = if let Some(l) = assoc_type_arg.type_bound_list() {
-                        l.bounds().map(|it| TypeBound::from_ast(lower_ctx, it)).collect()
+                        l.bounds()
+                            .map(|it| Interned::new(TypeBound::from_ast(lower_ctx, it)))
+                            .collect()
                     } else {
                         Vec::new()
                     };
diff --git a/crates/hir_def/src/type_ref.rs b/crates/hir_def/src/type_ref.rs
index cdcab7110..cbde6b940 100644
--- a/crates/hir_def/src/type_ref.rs
+++ b/crates/hir_def/src/type_ref.rs
@@ -5,7 +5,7 @@ use hir_expand::{name::Name, AstId, InFile};
 use std::convert::TryInto;
 use syntax::ast;
 
-use crate::{body::LowerCtx, path::Path};
+use crate::{body::LowerCtx, intern::Interned, path::Path};
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
 pub enum Mutability {
@@ -91,8 +91,8 @@ pub enum TypeRef {
     /// A fn pointer. Last element of the vector is the return type.
     Fn(Vec<TypeRef>, bool /*varargs*/),
     // For
-    ImplTrait(Vec<TypeBound>),
-    DynTrait(Vec<TypeBound>),
+    ImplTrait(Vec<Interned<TypeBound>>),
+    DynTrait(Vec<Interned<TypeBound>>),
     Macro(AstId<ast::MacroCall>),
     Error,
 }
@@ -232,7 +232,7 @@ impl TypeRef {
                 | TypeRef::Slice(type_ref) => go(&type_ref, f),
                 TypeRef::ImplTrait(bounds) | TypeRef::DynTrait(bounds) => {
                     for bound in bounds {
-                        match bound {
+                        match bound.as_ref() {
                             TypeBound::Path(path) => go_path(path, f),
                             TypeBound::Lifetime(_) | TypeBound::Error => (),
                         }
@@ -262,7 +262,7 @@ impl TypeRef {
                             go(type_ref, f);
                         }
                         for bound in &binding.bounds {
-                            match bound {
+                            match bound.as_ref() {
                                 TypeBound::Path(path) => go_path(path, f),
                                 TypeBound::Lifetime(_) | TypeBound::Error => (),
                             }
@@ -277,9 +277,9 @@ impl TypeRef {
 pub(crate) fn type_bounds_from_ast(
     lower_ctx: &LowerCtx,
     type_bounds_opt: Option<ast::TypeBoundList>,
-) -> Vec<TypeBound> {
+) -> Vec<Interned<TypeBound>> {
     if let Some(type_bounds) = type_bounds_opt {
-        type_bounds.bounds().map(|it| TypeBound::from_ast(lower_ctx, it)).collect()
+        type_bounds.bounds().map(|it| Interned::new(TypeBound::from_ast(lower_ctx, it))).collect()
     } else {
         vec![]
     }
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index 66b3418f2..a9994082a 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -18,9 +18,9 @@ ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 scoped-tls = "1"
-chalk-solve = { version = "0.64", default-features = false }
-chalk-ir = "0.64"
-chalk-recursive = "0.64"
+chalk-solve = { version = "0.67", default-features = false }
+chalk-ir = "0.67"
+chalk-recursive = "0.67"
 la-arena = { version = "0.2.0", path = "../../lib/arena" }
 
 stdx = { path = "../stdx", version = "0.0.0" }
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 7bbd1a1f7..637bbc634 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -13,6 +13,7 @@ use hir_def::{
     db::DefDatabase,
     find_path,
     generics::TypeParamProvenance,
+    intern::{Internable, Interned},
     item_scope::ItemInNs,
     path::{Path, PathKind},
     type_ref::{TypeBound, TypeRef},
@@ -256,6 +257,12 @@ impl<T: HirDisplay> HirDisplay for &'_ T {
     }
 }
 
+impl<T: HirDisplay + Internable> HirDisplay for Interned<T> {
+    fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
+        HirDisplay::hir_fmt(self.as_ref(), f)
+    }
+}
+
 impl HirDisplay for ProjectionTy {
     fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
         if f.should_truncate() {
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs
index 8a375b973..1645ac533 100644
--- a/crates/hir_ty/src/lower.rs
+++ b/crates/hir_ty/src/lower.rs
@@ -10,6 +10,7 @@ use std::{iter, sync::Arc};
 
 use base_db::CrateId;
 use chalk_ir::{cast::Cast, fold::Shift, interner::HasInterner, Mutability, Safety};
+use hir_def::intern::Interned;
 use hir_def::{
     adt::StructKind,
     body::{Expander, LowerCtx},
@@ -843,7 +844,7 @@ impl<'a> TyLoweringContext<'a> {
             })
     }
 
-    fn lower_impl_trait(&self, bounds: &[TypeBound]) -> ReturnTypeImplTrait {
+    fn lower_impl_trait(&self, bounds: &[Interned<TypeBound>]) -> ReturnTypeImplTrait {
         cov_mark::hit!(lower_rpit);
         let self_ty =
             TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(&Interner);
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 320694a17..ec3828ab2 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -286,7 +286,7 @@ fn get_doc_link(db: &RootDatabase, definition: Definition) -> Option<String> {
         .and_then(
             |url| if let Some(fragment) = fragment { url.join(&fragment).ok() } else { Some(url) },
         )
-        .map(|url| url.into_string())
+        .map(|url| url.into())
 }
 
 fn rewrite_intra_doc_link(
@@ -325,7 +325,7 @@ fn rewrite_intra_doc_link(
         };
     }
 
-    Some((new_url.into_string(), strip_prefixes_suffixes(title).to_string()))
+    Some((new_url.into(), strip_prefixes_suffixes(title).to_string()))
 }
 
 /// Try to resolve path to local documentation via path-based links (i.e. `../gateway/struct.Shard.html`).
@@ -345,7 +345,7 @@ fn rewrite_url_link(db: &RootDatabase, def: ModuleDef, target: &str) -> Option<S
             get_symbol_filename(db, &def).as_deref().map(|f| url.join(f).ok()).flatten()
         })
         .and_then(|url| url.join(target).ok())
-        .map(|url| url.into_string())
+        .map(|url| url.into())
 }
 
 /// Rewrites a markdown document, applying 'callback' to each link.
diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml
index 2ce5eeedd..2c4da394b 100644
--- a/crates/proc_macro_api/Cargo.toml
+++ b/crates/proc_macro_api/Cargo.toml
@@ -16,7 +16,7 @@ log = "0.4.8"
 crossbeam-channel = "0.5.0"
 jod-thread = "0.1.1"
 memmap2 = "0.2.0"
-object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] }
+object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] }
 snap = "1.0"
 
 tt = { path = "../tt", version = "0.0.0" }
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 63b3f1532..4ea41175e 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] }
+object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] }
 libloading = "0.7.0"
 memmap2 = "0.2.0"
 
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index baf10fea9..cccc53220 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -27,7 +27,7 @@ fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> {
     let file = File::open(file)?;
     let buffer = unsafe { Mmap::map(&file)? };
 
-    Ok(object::File::parse(&buffer)
+    Ok(object::File::parse(&*buffer)
         .map_err(invalid_data_err)?
         .exports()
         .map_err(invalid_data_err)?
diff --git a/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
index fa581f110..eb67c7134 100644
--- a/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
+++ b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
@@ -23,7 +23,7 @@ SUBTREE $
     SUBTREE [] 4294967295
       IDENT   allow 4294967295
       SUBTREE () 4294967295
-        IDENT   rust_2018_idioms 4294967295
+        IDENT   unused_extern_crates 4294967295
         PUNCH   , [alone] 4294967295
         IDENT   clippy 4294967295
         PUNCH   : [joint] 4294967295
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
index 227d96d51..bcc889681 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -33,6 +34,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -59,6 +61,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -84,6 +87,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -115,6 +119,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -146,6 +151,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -172,6 +178,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -203,6 +210,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -234,6 +242,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -260,6 +269,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -301,6 +311,7 @@
                             {
                                 Url {
                                     scheme: "file",
+                                    cannot_be_a_base: false,
                                     username: "",
                                     password: None,
                                     host: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
index e5f01fb33..d5ab03576 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -33,6 +34,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
index c847bbb35..8bee4cfe1 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -36,6 +37,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -67,6 +69,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -101,6 +104,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -132,6 +136,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -166,6 +171,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -191,6 +197,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
index 0d16af232..ada540ea6 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -33,6 +34,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
index 31b6a12ce..05074a914 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -33,6 +34,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
index f8adfad3b..749f49438 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -40,6 +41,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -75,6 +77,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -113,6 +116,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -154,6 +158,7 @@
                             {
                                 Url {
                                     scheme: "file",
+                                    cannot_be_a_base: false,
                                     username: "",
                                     password: None,
                                     host: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
index 5a70d2ed7..d20a91b39 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -40,6 +41,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -75,6 +77,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -113,6 +116,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -154,6 +158,7 @@
                             {
                                 Url {
                                     scheme: "file",
+                                    cannot_be_a_base: false,
                                     username: "",
                                     password: None,
                                     host: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
index 04ca0c9c2..2a9c3a9af 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -40,6 +41,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -75,6 +77,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -113,6 +116,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -154,6 +158,7 @@
                             {
                                 Url {
                                     scheme: "file",
+                                    cannot_be_a_base: false,
                                     username: "",
                                     password: None,
                                     host: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
index f7a313cf1..5ea27a152 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -33,6 +34,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -59,6 +61,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -90,6 +93,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -121,6 +125,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -147,6 +152,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
index 57d2f1ae3..43b1ea765 100644
--- a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
+++ b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
@@ -2,6 +2,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -33,6 +34,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -59,6 +61,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -84,6 +87,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -115,6 +119,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -146,6 +151,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -172,6 +178,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -203,6 +210,7 @@
     MappedRustDiagnostic {
         url: Url {
             scheme: "file",
+            cannot_be_a_base: false,
             username: "",
             password: None,
             host: None,
@@ -234,6 +242,7 @@
                 CodeDescription {
                     href: Url {
                         scheme: "https",
+                        cannot_be_a_base: false,
                         username: "",
                         password: None,
                         host: Some(
@@ -260,6 +269,7 @@
                         location: Location {
                             uri: Url {
                                 scheme: "file",
+                                cannot_be_a_base: false,
                                 username: "",
                                 password: None,
                                 host: None,
@@ -301,6 +311,7 @@
                             {
                                 Url {
                                     scheme: "file",
+                                    cannot_be_a_base: false,
                                     username: "",
                                     password: None,
                                     host: None,
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 0a3a56773..410384ae5 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -604,7 +604,7 @@ pub(crate) fn url_from_abs_path(path: &Path) -> lsp_types::Url {
     // Note: lowercasing the `path` itself doesn't help, the `Url::parse`
     // machinery *also* canonicalizes the drive letter. So, just massage the
     // string in place.
-    let mut url = url.into_string();
+    let mut url: String = url.into();
     url[driver_letter_range].make_ascii_lowercase();
     lsp_types::Url::parse(&url).unwrap()
 }
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 747f0b9eb..a6c294245 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -14,7 +14,7 @@ doctest = false
 cov-mark = { version = "1.1", features = ["thread-local"] }
 itertools = "0.10.0"
 rowan = "=0.13.0-pre.6"
-rustc_lexer = { version = "716.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "720.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.7"
 once_cell = "1.3.1"