Auto merge of rust-lang#119070 - lnicola:sync-from-ra, r=lnicola

Subtree update of `rust-analyzer`

src/tools/rust-analyzer/.github/workflows/metrics.yaml

@@ -67,7 +67,7 @@ jobs:
  other_metrics:
  strategy:
  matrix:
- names: [self, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
+ names: [self, rustc_tests, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
  runs-on: ubuntu-latest
  needs: [setup_cargo, build_metrics]
 
@@ -118,6 +118,11 @@ jobs:
  with:
  name: self-${{ github.sha }}
 
+ - name: Download rustc_tests metrics
+ uses: actions/download-artifact@v3
+ with:
+ name: rustc_tests-${{ github.sha }}
+
  - name: Download ripgrep-13.0.0 metrics
  uses: actions/download-artifact@v3
  with:
@@ -146,7 +151,7 @@ jobs:
  chmod 700 ~/.ssh
 
  git clone --depth 1 [email protected]:rust-analyzer/metrics.git
- jq -s ".[0] * .[1] * .[2] * .[3] * .[4] * .[5]" build.json self.json ripgrep-13.0.0.json webrender-2022.json diesel-1.4.8.json hyper-0.14.18.json -c >> metrics/metrics.json
+ jq -s ".[0] * .[1] * .[2] * .[3] * .[4] * .[5] * .[6]" build.json self.json rustc_tests.json ripgrep-13.0.0.json webrender-2022.json diesel-1.4.8.json hyper-0.14.18.json -c >> metrics/metrics.json
  cd metrics
  git add .
  git -c user.name=Bot -c [email protected] commit --message 📈

src/tools/rust-analyzer/Cargo.lock

@@ -684,7 +684,7 @@ dependencies = [
  "indexmap",
  "itertools",
  "limit",
- "line-index 0.1.0-pre.1",
+ "line-index 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr",
  "nohash-hasher",
  "once_cell",
@@ -881,17 +881,17 @@ version = "0.0.0"
 
 [[package]]
 name = "line-index"
-version = "0.1.0-pre.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cad96769710c1745e11d4f940a8ff36000ade4bbada4285b001cb8aa2f745ce"
+version = "0.1.1"
 dependencies = [
  "nohash-hasher",
  "text-size",
 ]
 
 [[package]]
 name = "line-index"
-version = "0.1.0"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67d61795376ae2683928c218fda7d7d7db136fd38c06b7552904667f0d55580a"
 dependencies = [
  "nohash-hasher",
  "text-size",
@@ -1545,6 +1545,7 @@ dependencies = [
  "triomphe",
  "vfs",
  "vfs-notify",
+ "walkdir",
  "winapi",
  "xflags",
  "xshell",

src/tools/rust-analyzer/Cargo.toml

@@ -85,7 +85,7 @@ rustc-dependencies = { path = "./crates/rustc-dependencies", version = "0.0.0" }
 proc-macro-test = { path = "./crates/proc-macro-test" }
 
 # In-tree crates that are published separately and follow semver. See lib/README.md
-line-index = { version = "0.1.0-pre.1" }
+line-index = { version = "0.1.1" }
 la-arena = { version = "0.3.1" }
 lsp-server = { version = "0.7.4" }
 

src/tools/rust-analyzer/crates/base-db/src/span.rs

@@ -151,21 +151,26 @@ impl fmt::Debug for HirFileIdRepr {
 
 impl From<FileId> for HirFileId {
  fn from(id: FileId) -> Self {
- assert!(id.index() < Self::MAX_FILE_ID);
+ _ = Self::ASSERT_MAX_FILE_ID_IS_SAME;
+ assert!(id.index() <= Self::MAX_HIR_FILE_ID, "FileId index {} is too large", id.index());
  HirFileId(id.index())
  }
 }
 
 impl From<MacroFileId> for HirFileId {
  fn from(MacroFileId { macro_call_id: MacroCallId(id) }: MacroFileId) -> Self {
+ _ = Self::ASSERT_MAX_FILE_ID_IS_SAME;
  let id = id.as_u32();
- assert!(id < Self::MAX_FILE_ID);
+ assert!(id <= Self::MAX_HIR_FILE_ID, "MacroCallId index {} is too large", id);
  HirFileId(id | Self::MACRO_FILE_TAG_MASK)
  }
 }
 
 impl HirFileId {
- const MAX_FILE_ID: u32 = u32::MAX ^ Self::MACRO_FILE_TAG_MASK;
+ const ASSERT_MAX_FILE_ID_IS_SAME: () =
+ [()][(Self::MAX_HIR_FILE_ID != FileId::MAX_FILE_ID) as usize];
+
+ const MAX_HIR_FILE_ID: u32 = u32::MAX ^ Self::MACRO_FILE_TAG_MASK;
  const MACRO_FILE_TAG_MASK: u32 = 1 << 31;
 
  #[inline]

src/tools/rust-analyzer/crates/hir-def/src/attr/builtin.rs

@@ -2,7 +2,7 @@
 //!
 //! The actual definitions were copied from rustc's `compiler/rustc_feature/src/builtin_attrs.rs`.
 //!
-//! It was last synchronized with upstream commit e29821ff85a2a3000d226f99f62f89464028d5d6.
+//! It was last synchronized with upstream commit c3def263a44e07e09ae6d57abfc8650227fb4972.
 //!
 //! The macros were adjusted to only expand to the attribute name, since that is all we need to do
 //! name resolution, and `BUILTIN_ATTRIBUTES` is almost entirely unchanged from the original, to
@@ -240,7 +240,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  template!(List: "address, kcfi, memory, thread"), DuplicatesOk,
  experimental!(no_sanitize)
  ),
- gated!(coverage, Normal, template!(Word, List: "on|off"), WarnFollowing, experimental!(coverage)),
+ gated!(coverage, Normal, template!(Word, List: "on|off"), WarnFollowing, coverage_attribute, experimental!(coverage)),
 
  ungated!(
  doc, Normal, template!(List: "hidden|inline|...", NameValueStr: "string"), DuplicatesOk
@@ -364,7 +364,6 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  allow_internal_unsafe, Normal, template!(Word), WarnFollowing,
  "allow_internal_unsafe side-steps the unsafe_code lint",
  ),
- ungated!(rustc_safe_intrinsic, Normal, template!(Word), DuplicatesOk),
  rustc_attr!(rustc_allowed_through_unstable_modules, Normal, template!(Word), WarnFollowing,
  "rustc_allowed_through_unstable_modules special cases accidental stabilizations of stable items \
  through unstable paths"),
@@ -453,6 +452,12 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  ErrorFollowing,
  INTERNAL_UNSTABLE
  ),
+ rustc_attr!(
+ rustc_confusables, Normal,
+ template!(List: r#""name1", "name2", ..."#),
+ ErrorFollowing,
+ INTERNAL_UNSTABLE,
+ ),
  // Enumerates "identity-like" conversion methods to suggest on type mismatch.
  rustc_attr!(
  rustc_conversion_suggestion, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE
@@ -488,6 +493,10 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  rustc_attr!(
  rustc_do_not_const_check, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE
  ),
+ // Ensure the argument to this function is &&str during const-check.
+ rustc_attr!(
+ rustc_const_panic_str, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE
+ ),
 
  // ==========================================================================
  // Internal attributes, Layout related:
@@ -520,6 +529,10 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  rustc_pass_by_value, Normal, template!(Word), ErrorFollowing,
  "#[rustc_pass_by_value] is used to mark types that must be passed by value instead of reference."
  ),
+ rustc_attr!(
+ rustc_never_returns_null_ptr, Normal, template!(Word), ErrorFollowing,
+ "#[rustc_never_returns_null_ptr] is used to mark functions returning non-null pointers."
+ ),
  rustc_attr!(
  rustc_coherence_is_core, AttributeType::CrateLevel, template!(Word), ErrorFollowing, @only_local: true,
  "#![rustc_coherence_is_core] allows inherent methods on builtin types, only intended to be used in `core`."
@@ -533,7 +546,11 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  "#[rustc_allow_incoherent_impl] has to be added to all impl items of an incoherent inherent impl."
  ),
  rustc_attr!(
- rustc_deny_explicit_impl, AttributeType::Normal, template!(Word), ErrorFollowing, @only_local: false,
+ rustc_deny_explicit_impl,
+ AttributeType::Normal,
+ template!(List: "implement_via_object = (true|false)"),
+ ErrorFollowing,
+ @only_local: true,
  "#[rustc_deny_explicit_impl] enforces that a trait can have no user-provided impls"
  ),
  rustc_attr!(
@@ -614,6 +631,10 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  rustc_doc_primitive, Normal, template!(NameValueStr: "primitive name"), ErrorFollowing,
  r#"`rustc_doc_primitive` is a rustc internal attribute"#,
  ),
+ rustc_attr!(
+ rustc_safe_intrinsic, Normal, template!(Word), WarnFollowing,
+ "the `#[rustc_safe_intrinsic]` attribute is used internally to mark intrinsics as safe"
+ ),
 
  // ==========================================================================
  // Internal attributes, Testing:
@@ -625,13 +646,16 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
  rustc_attr!(TEST, rustc_insignificant_dtor, Normal, template!(Word), WarnFollowing),
  rustc_attr!(TEST, rustc_strict_coherence, Normal, template!(Word), WarnFollowing),
  rustc_attr!(TEST, rustc_variance, Normal, template!(Word), WarnFollowing),
+ rustc_attr!(TEST, rustc_variance_of_opaques, Normal, template!(Word), WarnFollowing),
+ rustc_attr!(TEST, rustc_hidden_type_of_opaques, Normal, template!(Word), WarnFollowing),
  rustc_attr!(TEST, rustc_layout, Normal, template!(List: "field1, field2, ..."), WarnFollowing),
+ rustc_attr!(TEST, rustc_abi, Normal, template!(List: "field1, field2, ..."), WarnFollowing),
  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
  ),
- rustc_attr!(TEST, rustc_dump_user_substs, Normal, template!(Word), WarnFollowing),
+ rustc_attr!(TEST, rustc_dump_user_args, Normal, template!(Word), WarnFollowing),
  rustc_attr!(TEST, rustc_evaluate_where_clauses, Normal, template!(Word), WarnFollowing),
  rustc_attr!(
  TEST, rustc_if_this_changed, Normal, template!(Word, List: "DepNode"), DuplicatesOk

src/tools/rust-analyzer/crates/hir-def/src/child_by_source.rs

@@ -5,8 +5,7 @@
 //! node for a *child*, and get its hir.
 
 use either::Either;
-use hir_expand::HirFileId;
-use syntax::ast::HasDocComments;
+use hir_expand::{attrs::collect_attrs, HirFileId};
 
 use crate::{
  db::DefDatabase,
@@ -118,8 +117,8 @@ impl ChildBySource for ItemScope {
  |(ast_id, calls)| {
  let adt = ast_id.to_node(db.upcast());
  calls.for_each(|(attr_id, call_id, calls)| {
- if let Some(Either::Left(attr)) =
- adt.doc_comments_and_attrs().nth(attr_id.ast_index())
+ if let Some((_, Either::Left(attr))) =
+ collect_attrs(&adt).nth(attr_id.ast_index())
  {
  res[keys::DERIVE_MACRO_CALL].insert(attr, (attr_id, call_id, calls.into()));
  }

src/tools/rust-analyzer/crates/hir-def/src/generics.rs

@@ -222,11 +222,10 @@ impl GenericParams {
  let module = loc.container.module(db);
  let func_data = db.function_data(id);
 
- // Don't create an `Expander` nor call `loc.source(db)` if not needed since this
- // causes a reparse after the `ItemTree` has been created.
- let mut expander = Lazy::new(|| {
- (module.def_map(db), Expander::new(db, loc.source(db).file_id, module))
- });
+ // Don't create an `Expander` if not needed since this
+ // could cause a reparse after the `ItemTree` has been created due to the spanmap.
+ let mut expander =
+ Lazy::new(|| (module.def_map(db), Expander::new(db, loc.id.file_id(), module)));
  for param in func_data.params.iter() {
  generic_params.fill_implicit_impl_trait_args(db, &mut expander, param);
  }