Skip to content

Commit f241c0c

Browse files
committed
Auto merge of #100708 - matthiaskrgr:rollup-vl0olnj, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #97962 (Make must_not_suspend lint see through references when drop tracking is enabled) - #99966 (avoid assertion failures in try_to_scalar_int) - #100637 (Improving Fuchsia rustc support documentation) - #100643 (Point at a type parameter shadowing another type) - #100651 (Migrations for rustc_expand transcribe.rs) - #100669 (Attribute cleanups) - #100670 (Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery) - #100674 (Migrate lint reports in typeck::check_unused to LintDiagnostic) - #100688 (`ty::Error` does not match other types for region constraints) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9c20b2a + c7a4942 commit f241c0c

File tree

39 files changed

+314
-102
lines changed

39 files changed

+314
-102
lines changed

compiler/rustc_builtin_macros/src/deriving/bounds.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub fn expand_deriving_copy(
1515
) {
1616
let trait_def = TraitDef {
1717
span,
18-
attributes: Vec::new(),
1918
path: path_std!(marker::Copy),
2019
additional_bounds: Vec::new(),
2120
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/clone.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ pub fn expand_deriving_clone(
7171
let attrs = vec![cx.attribute(inline)];
7272
let trait_def = TraitDef {
7373
span,
74-
attributes: Vec::new(),
7574
path: path_std!(clone::Clone),
7675
additional_bounds: bounds,
7776
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub fn expand_deriving_eq(
2323
let attrs = vec![cx.attribute(inline), cx.attribute(doc), cx.attribute(no_coverage)];
2424
let trait_def = TraitDef {
2525
span,
26-
attributes: Vec::new(),
2726
path: path_std!(cmp::Eq),
2827
additional_bounds: Vec::new(),
2928
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ pub fn expand_deriving_ord(
1818
let attrs = vec![cx.attribute(inline)];
1919
let trait_def = TraitDef {
2020
span,
21-
attributes: Vec::new(),
2221
path: path_std!(cmp::Ord),
2322
additional_bounds: Vec::new(),
2423
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ pub fn expand_deriving_partial_eq(
9898

9999
let trait_def = TraitDef {
100100
span,
101-
attributes: Vec::new(),
102101
path: path_std!(cmp::PartialEq),
103102
additional_bounds: Vec::new(),
104103
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ pub fn expand_deriving_partial_ord(
3636

3737
let trait_def = TraitDef {
3838
span,
39-
attributes: vec![],
4039
path: path_std!(cmp::PartialOrd),
4140
additional_bounds: vec![],
4241
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/debug.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub fn expand_deriving_debug(
1919

2020
let trait_def = TraitDef {
2121
span,
22-
attributes: Vec::new(),
2322
path: path_std!(fmt::Debug),
2423
additional_bounds: Vec::new(),
2524
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/decodable.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ pub fn expand_deriving_rustc_decodable(
2222

2323
let trait_def = TraitDef {
2424
span,
25-
attributes: Vec::new(),
2625
path: Path::new_(vec![krate, sym::Decodable], vec![], PathKind::Global),
2726
additional_bounds: Vec::new(),
2827
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/default.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ pub fn expand_deriving_default(
2525
let attrs = vec![cx.attribute(inline)];
2626
let trait_def = TraitDef {
2727
span,
28-
attributes: Vec::new(),
2928
path: Path::new(vec![kw::Default, sym::Default]),
3029
additional_bounds: Vec::new(),
3130
generics: Bounds::empty(),

compiler/rustc_builtin_macros/src/deriving/encodable.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ pub fn expand_deriving_rustc_encodable(
106106

107107
let trait_def = TraitDef {
108108
span,
109-
attributes: Vec::new(),
110109
path: Path::new_(vec![krate, sym::Encodable], vec![], PathKind::Global),
111110
additional_bounds: Vec::new(),
112111
generics: Bounds::empty(),

0 commit comments

Comments
 (0)