Merge pull request #22048 from ChayimFriedman2/upgrade-rustc

internal: Upgrade rustc crates

Author: ChayimFriedman2

Cargo.lock

@@ -86,14 +86,14 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 edition = { path = "./crates/edition", version = "0.0.0" }
 
-ra-ap-rustc_lexer = { version = "0.143", default-features = false }
-ra-ap-rustc_parse_format = { version = "0.143", default-features = false }
-ra-ap-rustc_index = { version = "0.143", default-features = false }
-ra-ap-rustc_abi = { version = "0.143", default-features = false }
-ra-ap-rustc_pattern_analysis = { version = "0.143", default-features = false }
-ra-ap-rustc_ast_ir = { version = "0.143", default-features = false }
-ra-ap-rustc_type_ir = { version = "0.143", default-features = false }
-ra-ap-rustc_next_trait_solver = { version = "0.143", default-features = false }
+ra-ap-rustc_lexer = { version = "0.160", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.160", default-features = false }
+ra-ap-rustc_index = { version = "0.160", default-features = false }
+ra-ap-rustc_abi = { version = "0.160", default-features = false }
+ra-ap-rustc_pattern_analysis = { version = "0.160", default-features = false }
+ra-ap-rustc_ast_ir = { version = "0.160", default-features = false }
+ra-ap-rustc_type_ir = { version = "0.160", default-features = false }
+ra-ap-rustc_next_trait_solver = { version = "0.160", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 
@@ -127,7 +127,7 @@ object = { version = "0.36.7", default-features = false, features = [
     "macho",
     "pe",
 ] }
-postcard = {version = "1.1.3", features = ["alloc"]}
+postcard = { version = "1.1.3", features = ["alloc"] }
 process-wrap = { version = "8.2.1", features = ["std"] }
 pulldown-cmark-to-cmark = "10.0.4"
 pulldown-cmark = { version = "0.9.6", default-features = false }
@@ -186,7 +186,10 @@ hashbrown = { version = "0.14.*", features = [
 elided_lifetimes_in_paths = "warn"
 explicit_outlives_requirements = "warn"
 unsafe_op_in_unsafe_fn = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bootstrap)', "cfg(no_salsa_async_drops)"] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(bootstrap)',
+    "cfg(no_salsa_async_drops)",
+] }
 unused_extern_crates = "warn"
 unused_lifetimes = "warn"
 unreachable_pub = "warn"

Cargo.toml

@@ -159,7 +159,7 @@ fn match_attr_flags(attr_flags: &mut AttrFlags, attr: ast::Meta) -> ControlFlow<
                 None => match &*first_segment {
                     "deprecated" => attr_flags.insert(AttrFlags::IS_DEPRECATED),
                     "doc" => extract_doc_tt_attr(attr_flags, tt),
-                    "repr" => attr_flags.insert(AttrFlags::HAS_REPR),
+                    "repr" | "rustc_scalable_vector" => attr_flags.insert(AttrFlags::HAS_REPR),
                     "target_feature" => attr_flags.insert(AttrFlags::HAS_TARGET_FEATURE),
                     "proc_macro_derive" | "rustc_builtin_macro" => {
                         attr_flags.insert(AttrFlags::IS_DERIVE_OR_BUILTIN_MACRO)
@@ -217,6 +217,7 @@ fn match_attr_flags(attr_flags: &mut AttrFlags, attr: ast::Meta) -> ControlFlow<
                     "rustc_allow_incoherent_impl" => {
                         attr_flags.insert(AttrFlags::RUSTC_ALLOW_INCOHERENT_IMPL)
                     }
+                    "rustc_scalable_vector" => attr_flags.insert(AttrFlags::HAS_REPR),
                     "fundamental" => attr_flags.insert(AttrFlags::FUNDAMENTAL),
                     "no_std" => attr_flags.insert(AttrFlags::IS_NO_STD),
                     "may_dangle" => attr_flags.insert(AttrFlags::MAY_DANGLE),
@@ -724,14 +725,40 @@ impl AttrFlags {
         fn repr(db: &dyn DefDatabase, owner: AdtId) -> Option<ReprOptions> {
             let mut result = None;
             collect_attrs::<Infallible>(db, owner.into(), |attr| {
-                if let ast::Meta::TokenTreeMeta(attr) = attr
-                    && attr.path().is1("repr")
+                let mut current = None;
+                if let ast::Meta::TokenTreeMeta(attr) = &attr
+                    && let Some(path) = attr.path()
                     && let Some(tt) = attr.token_tree()
-                    && let Some(repr) = parse_repr_tt(&tt)
                 {
+                    if path.is1("repr")
+                        && let Some(repr) = parse_repr_tt(&tt)
+                    {
+                        current = Some(repr);
+                    } else if path.is1("rustc_scalable_vector")
+                        && let mut tt = TokenTreeChildren::new(&tt)
+                        && let Some(NodeOrToken::Token(scalable)) = tt.next()
+                        && let Some(scalable) = ast::IntNumber::cast(scalable)
+                        && let Ok(scalable) = scalable.value()
+                        && let Ok(scalable) = scalable.try_into()
+                    {
+                        current = Some(ReprOptions {
+                            scalable: Some(rustc_abi::ScalableElt::ElementCount(scalable)),
+                            ..ReprOptions::default()
+                        });
+                    }
+                } else if let ast::Meta::PathMeta(attr) = &attr
+                    && attr.path().is1("rustc_scalable_vector")
+                {
+                    current = Some(ReprOptions {
+                        scalable: Some(rustc_abi::ScalableElt::Container),
+                        ..ReprOptions::default()
+                    });
+                }
+
+                if let Some(current) = current {
                     match &mut result {
-                        Some(existing) => merge_repr(existing, repr),
-                        None => result = Some(repr),
+                        Some(existing) => merge_repr(existing, current),
+                        None => result = Some(current),
                     }
                 }
                 ControlFlow::Continue(())
@@ -1114,7 +1141,7 @@ impl AttrFlags {
 }
 
 fn merge_repr(this: &mut ReprOptions, other: ReprOptions) {
-    let ReprOptions { int, align, pack, flags, field_shuffle_seed: _ } = this;
+    let ReprOptions { int, align, pack, flags, scalable, field_shuffle_seed: _ } = this;
     flags.insert(other.flags);
     *align = (*align).max(other.align);
     *pack = match (*pack, other.pack) {
@@ -1124,6 +1151,9 @@ fn merge_repr(this: &mut ReprOptions, other: ReprOptions) {
     if other.int.is_some() {
         *int = other.int;
     }
+    if other.scalable.is_some() {
+        *scalable = other.scalable;
+    }
 }
 
 fn parse_repr_tt(tt: &ast::TokenTree) -> Option<ReprOptions> {

crates/hir-def/src/attrs.rs

@@ -21,7 +21,7 @@ use std::fmt;
 use hir_expand::{MacroDefId, name::Name};
 use intern::Symbol;
 use la_arena::Idx;
-use rustc_apfloat::ieee::{Half as f16, Quad as f128};
+use rustc_apfloat::ieee::{Double, Half, Quad, Single};
 use syntax::ast;
 use type_ref::TypeRefId;
 
@@ -94,19 +94,19 @@ impl FloatTypeWrapper {
         Self(sym)
     }
 
-    pub fn to_f128(&self) -> f128 {
+    pub fn to_f128(&self) -> Quad {
         self.0.as_str().parse().unwrap_or_default()
     }
 
-    pub fn to_f64(&self) -> f64 {
+    pub fn to_f64(&self) -> Double {
         self.0.as_str().parse().unwrap_or_default()
     }
 
-    pub fn to_f32(&self) -> f32 {
+    pub fn to_f32(&self) -> Single {
         self.0.as_str().parse().unwrap_or_default()
     }
 
-    pub fn to_f16(&self) -> f16 {
+    pub fn to_f16(&self) -> Half {
         self.0.as_str().parse().unwrap_or_default()
     }
 }