Rollup of 18 pull requests

Cargo.lock

@@ -2558,8 +2558,10 @@ dependencies = [
  "serde",
  "serde_json",
  "smallvec",
+ "socket2",
  "tempfile",
  "ui_test",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5472,9 +5474,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",

compiler/rustc_attr_ir/src/data_structures.rs

@@ -283,7 +283,6 @@ impl<ScopeId> StrippedCfgItem<ScopeId> {
 #[derive(StableHash, PrintAttribute)]
 pub enum Linkage {
     AvailableExternally,
-    Common,
     ExternalWeak,
     External,
     Internal,

compiler/rustc_attr_ir/src/encode_cross_crate.rs

@@ -265,7 +265,6 @@ impl AttributeKind {
             Linkage(linkage, _) => match *linkage {
                 crate::Linkage::Internal => false,
                 crate::Linkage::AvailableExternally
-                | crate::Linkage::Common
                 | crate::Linkage::External
                 | crate::Linkage::ExternalWeak
                 | crate::Linkage::LinkOnceAny

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -306,7 +306,8 @@ pub fn parse_cfg_attr(
     features: Option<&Features>,
     lint_node_id: ast::NodeId,
 ) -> Option<(CfgEntry, Vec<(WithTokens<AttrItem>, Span)>)> {
-    match &cfg_attr.get_normal_item().args {
+    let item = cfg_attr.get_normal_item();
+    match &item.args {
         ast::AttrArgs::Delimited(ast::DelimArgs { dspan, delim, tokens }) if !tokens.is_empty() => {
             check_cfg_attr_bad_delim(&sess.psess, *dspan, *delim);
             match parse_in(&sess.psess, tokens.clone(), "`cfg_attr` input", |p| {
@@ -316,11 +317,11 @@ pub fn parse_cfg_attr(
                 Err(e) => {
                     let suggestions = CFG_ATTR_TEMPLATE.suggestions(
                         ParsedDescription::Attribute,
-                        cfg_attr.get_normal_item().unsafety,
+                        item.unsafety,
                         sym::cfg_attr,
                     );
                     e.with_span_suggestions(
-                        cfg_attr.get_normal_item().span,
+                        item.span,
                         "must be of the form",
                         suggestions,
                         Applicability::HasPlaceholders,
@@ -334,25 +335,24 @@ pub fn parse_cfg_attr(
             }
         }
         _ => {
-            let (span, reason) = if let ast::AttrArgs::Delimited(ast::DelimArgs { dspan, .. }) =
-                cfg_attr.get_normal_item().args
-            {
-                (dspan.entire(), AttributeParseErrorReason::ExpectedAtLeastOneArgument)
-            } else {
-                (cfg_attr.get_normal_item().span, AttributeParseErrorReason::ExpectedList)
-            };
+            let (span, reason) =
+                if let ast::AttrArgs::Delimited(ast::DelimArgs { dspan, .. }) = item.args {
+                    (dspan.entire(), AttributeParseErrorReason::ExpectedAtLeastOneArgument)
+                } else {
+                    (item.span, AttributeParseErrorReason::ExpectedList)
+                };
 
             sess.dcx().emit_err(AttributeParseError {
                 span,
-                inner_span: cfg_attr.get_normal_item().span,
+                inner_span: item.span,
                 template: CFG_ATTR_TEMPLATE,
-                path: AttrPath::from_ast(&cfg_attr.get_normal_item().path, identity),
+                path: AttrPath::from_ast(&item.path, identity),
                 description: ParsedDescription::Attribute,
                 reason,
                 suggestions: diagnostics::AttributeParseErrorSuggestions::CreatedByTemplate(
                     CFG_ATTR_TEMPLATE.suggestions(
                         ParsedDescription::Attribute,
-                        cfg_attr.get_normal_item().unsafety,
+                        item.unsafety,
                         sym::cfg_attr,
                     ),
                 ),
@@ -389,13 +389,14 @@ fn parse_cfg_attr_internal<'a>(
     )?;
     let pred_span = pred_start.with_hi(parser.token.span.hi());
 
+    let item = attribute.get_normal_item();
     let cfg_predicate = AttributeParser::parse_single_args(
         sess,
         attribute.span,
-        attribute.get_normal_item().span,
+        item.span,
         attribute.style,
         AttrPath { segments: attribute.path().into_boxed_slice(), span: attribute.span },
-        Some(attribute.get_normal_item().unsafety),
+        Some(item.unsafety),
         AttributeSafety::Normal,
         ParsedDescription::Attribute,
         pred_span,

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -685,10 +685,7 @@ impl SingleAttributeParser for LinkageParser {
     ]);
     const TEMPLATE: AttributeTemplate = template!(NameValueStr: [
         "available_externally",
-        "common",
         "extern_weak",
-        "external",
-        "internal",
         "linkonce",
         "linkonce_odr",
         "weak",
@@ -711,10 +708,7 @@ impl SingleAttributeParser for LinkageParser {
         // and don't have to be, LLVM treats them as no-ops.
         let linkage = match value {
             sym::available_externally => Linkage::AvailableExternally,
-            sym::common => Linkage::Common,
             sym::extern_weak => Linkage::ExternalWeak,
-            sym::external => Linkage::External,
-            sym::internal => Linkage::Internal,
             sym::linkonce => Linkage::LinkOnceAny,
             sym::linkonce_odr => Linkage::LinkOnceODR,
             sym::weak => Linkage::WeakAny,
@@ -725,10 +719,7 @@ impl SingleAttributeParser for LinkageParser {
                     name_value.value_span,
                     &[
                         sym::available_externally,
-                        sym::common,
                         sym::extern_weak,
-                        sym::external,
-                        sym::internal,
                         sym::linkonce,
                         sym::linkonce_odr,
                         sym::weak,

compiler/rustc_attr_parsing/src/diagnostics.rs

@@ -1235,7 +1235,7 @@ pub(crate) struct UnknownVersionLiteral {
 #[diag("multiple `{$name}` attributes")]
 pub(crate) struct UnusedMultiple {
     #[primary_span]
-    #[suggestion("remove this attribute", code = "", applicability = "machine-applicable")]
+    #[suggestion("remove this attribute", code = "", applicability = "unspecified")]
     pub this: Span,
     #[note("attribute also specified here")]
     pub other: Span,
@@ -2061,7 +2061,7 @@ pub(crate) struct AdditionalCommaSuggestion {
 #[derive(Diagnostic)]
 #[diag("unused attribute")]
 pub(crate) struct UnusedDuplicate {
-    #[suggestion("remove this attribute", code = "", applicability = "machine-applicable")]
+    #[suggestion("remove this attribute", code = "", applicability = "unspecified")]
     pub this: Span,
     #[note("attribute also specified here")]
     pub other: Span,

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -1361,7 +1361,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
                         let cast_ty_from = CastTy::from_ty(ty_from);
                         let cast_ty_to = CastTy::from_ty(*ty);
                         match (cast_ty_from, cast_ty_to) {
-                            (Some(CastTy::Ptr(_) | CastTy::FnPtr), Some(CastTy::Int(_))) => (),
+                            (Some(CastTy::Ptr(_) | CastTy::FnPtr), Some(CastTy::Int)) => (),
                             _ => {
                                 span_mirbug!(
                                     self,
@@ -1379,7 +1379,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
                         let cast_ty_from = CastTy::from_ty(ty_from);
                         let cast_ty_to = CastTy::from_ty(*ty);
                         match (cast_ty_from, cast_ty_to) {
-                            (Some(CastTy::Int(_)), Some(CastTy::Ptr(_))) => (),
+                            (Some(CastTy::Int), Some(CastTy::Ptr(_))) => (),
                             _ => {
                                 span_mirbug!(
                                     self,
@@ -1396,7 +1396,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
                         let cast_ty_from = CastTy::from_ty(ty_from);
                         let cast_ty_to = CastTy::from_ty(*ty);
                         match (cast_ty_from, cast_ty_to) {
-                            (Some(CastTy::Int(_)), Some(CastTy::Int(_))) => (),
+                            (Some(from), Some(to)) if from.is_int_like() && to.is_int_like() => (),
                             _ => {
                                 span_mirbug!(
                                     self,
@@ -1413,7 +1413,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
                         let cast_ty_from = CastTy::from_ty(ty_from);
                         let cast_ty_to = CastTy::from_ty(*ty);
                         match (cast_ty_from, cast_ty_to) {
-                            (Some(CastTy::Int(_)), Some(CastTy::Float)) => (),
+                            (Some(CastTy::Int), Some(CastTy::Float)) => (),
                             _ => {
                                 span_mirbug!(
                                     self,
@@ -1430,7 +1430,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
                         let cast_ty_from = CastTy::from_ty(ty_from);
                         let cast_ty_to = CastTy::from_ty(*ty);
                         match (cast_ty_from, cast_ty_to) {
-                            (Some(CastTy::Float), Some(CastTy::Int(_))) => (),
+                            (Some(CastTy::Float), Some(CastTy::Int)) => (),
                             _ => {
                                 span_mirbug!(
                                     self,

compiler/rustc_builtin_macros/src/format.rs

@@ -339,7 +339,9 @@ fn make_format_args(
             parse::Suggestion::UsePositional => {
                 let captured_arg_span =
                     fmt_span.from_inner(InnerSpan::new(err.span.start, err.span.end));
-                if let Ok(arg) = ecx.source_map().span_to_snippet(captured_arg_span) {
+                if is_source_literal
+                    && let Ok(arg) = ecx.source_map().span_to_snippet(captured_arg_span)
+                {
                     let span = match args.unnamed_args().last() {
                         Some(arg) => arg.expr.span,
                         None => fmt_span,
@@ -360,17 +362,21 @@ fn make_format_args(
                 }
             }
             parse::Suggestion::ReorderFormatParameter(span, replacement) => {
-                let span = fmt_span.from_inner(InnerSpan::new(span.start, span.end));
-                e.sugg_ =
-                    Some(diagnostics::InvalidFormatStringSuggestion::ReorderFormatParameter {
-                        span,
-                        replacement,
-                    });
+                if is_source_literal {
+                    let span = fmt_span.from_inner(InnerSpan::new(span.start, span.end));
+                    e.sugg_ =
+                        Some(diagnostics::InvalidFormatStringSuggestion::ReorderFormatParameter {
+                            span,
+                            replacement,
+                        });
+                }
             }
             parse::Suggestion::AddMissingColon(span) => {
-                let span = fmt_span.from_inner(InnerSpan::new(span.start, span.end));
-                e.sugg_ =
-                    Some(diagnostics::InvalidFormatStringSuggestion::AddMissingColon { span });
+                if is_source_literal {
+                    let span = fmt_span.from_inner(InnerSpan::new(span.start, span.end));
+                    e.sugg_ =
+                        Some(diagnostics::InvalidFormatStringSuggestion::AddMissingColon { span });
+                }
             }
             parse::Suggestion::UseRustDebugPrintingMacro => {
                 // This targets `println!("{=}", x);` and `println!("{0=}", x);`