mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
Auto merge of #149891 - matthiaskrgr:rollup-jh6xrhz, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#142380 (Put negative implementors first and apply same ordering logic to foreign implementors) - rust-lang/rust#146584 (remove duplicated columns from `rustc_error_code::error_codes!`) - rust-lang/rust#148717 (Point at span within local macros even when error happens in nested external macro) - rust-lang/rust#149565 (rustdoc: Add unstable `--merge-doctests=yes/no/auto` flag) - rust-lang/rust#149770 (Rename some issue-* tests) - rust-lang/rust#149807 (Use ubuntu:24.04 for the `x86_64-gnu-miri` job) - rust-lang/rust#149850 (Remove "tidy" tool for `tests/rustdoc` testsuite) - rust-lang/rust#149863 (Do not suggest moving expression out of for loop when hitting `break` from desugaring) - rust-lang/rust#149867 (only resolve main in bin crates) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
@@ -4521,7 +4521,9 @@ struct BreakFinder {
|
||||
impl<'hir> Visitor<'hir> for BreakFinder {
|
||||
fn visit_expr(&mut self, ex: &'hir hir::Expr<'hir>) {
|
||||
match ex.kind {
|
||||
hir::ExprKind::Break(destination, _) => {
|
||||
hir::ExprKind::Break(destination, _)
|
||||
if !ex.span.is_desugaring(DesugaringKind::ForLoop) =>
|
||||
{
|
||||
self.found_breaks.push((destination, ex.span));
|
||||
}
|
||||
hir::ExprKind::Continue(destination) => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#### this error code is no longer emitted by the compiler.
|
||||
#### Note: this error code is no longer emitted by the compiler.
|
||||
|
||||
This was triggered when multiple macro definitions used the same
|
||||
`#[rustc_builtin_macro(..)]`. This is no longer an error.
|
||||
|
||||
@@ -18,533 +18,531 @@
|
||||
// Also, the contents of this macro is checked by tidy (in `check_error_codes_docs`). If you change
|
||||
// the macro syntax you will need to change tidy as well.
|
||||
//
|
||||
// Both columns are necessary because it's not possible in Rust to create a new identifier such as
|
||||
// `E0123` from an integer literal such as `0123`, unfortunately.
|
||||
//
|
||||
// Do *not* remove entries from this list. Instead, just add a note th the corresponding markdown
|
||||
// Do *not* remove entries from this list. Instead, just add a note to the corresponding markdown
|
||||
// file saying that this error is not emitted by the compiler any more (see E0001.md for an
|
||||
// example), and remove all code examples that do not build any more.
|
||||
#[macro_export]
|
||||
#[rustfmt::skip]
|
||||
macro_rules! error_codes {
|
||||
($macro:path) => (
|
||||
$macro!(
|
||||
E0001: 0001,
|
||||
E0002: 0002,
|
||||
E0004: 0004,
|
||||
E0005: 0005,
|
||||
E0007: 0007,
|
||||
E0009: 0009,
|
||||
E0010: 0010,
|
||||
E0013: 0013,
|
||||
E0014: 0014,
|
||||
E0015: 0015,
|
||||
E0023: 0023,
|
||||
E0025: 0025,
|
||||
E0026: 0026,
|
||||
E0027: 0027,
|
||||
E0029: 0029,
|
||||
E0030: 0030,
|
||||
E0033: 0033,
|
||||
E0034: 0034,
|
||||
E0038: 0038,
|
||||
E0040: 0040,
|
||||
E0044: 0044,
|
||||
E0045: 0045,
|
||||
E0046: 0046,
|
||||
E0049: 0049,
|
||||
E0050: 0050,
|
||||
E0053: 0053,
|
||||
E0054: 0054,
|
||||
E0055: 0055,
|
||||
E0057: 0057,
|
||||
E0059: 0059,
|
||||
E0060: 0060,
|
||||
E0061: 0061,
|
||||
E0062: 0062,
|
||||
E0063: 0063,
|
||||
E0067: 0067,
|
||||
E0069: 0069,
|
||||
E0070: 0070,
|
||||
E0071: 0071,
|
||||
E0072: 0072,
|
||||
E0073: 0073,
|
||||
E0074: 0074,
|
||||
E0075: 0075,
|
||||
E0076: 0076,
|
||||
E0077: 0077,
|
||||
E0080: 0080,
|
||||
E0081: 0081,
|
||||
E0084: 0084,
|
||||
E0087: 0087,
|
||||
E0088: 0088,
|
||||
E0089: 0089,
|
||||
E0090: 0090,
|
||||
E0091: 0091,
|
||||
E0092: 0092,
|
||||
E0093: 0093,
|
||||
E0094: 0094,
|
||||
E0106: 0106,
|
||||
E0107: 0107,
|
||||
E0109: 0109,
|
||||
E0110: 0110,
|
||||
E0116: 0116,
|
||||
E0117: 0117,
|
||||
E0118: 0118,
|
||||
E0119: 0119,
|
||||
E0120: 0120,
|
||||
E0121: 0121,
|
||||
E0124: 0124,
|
||||
E0128: 0128,
|
||||
E0130: 0130,
|
||||
E0131: 0131,
|
||||
E0132: 0132,
|
||||
E0133: 0133,
|
||||
E0136: 0136,
|
||||
E0137: 0137,
|
||||
E0138: 0138,
|
||||
E0139: 0139,
|
||||
E0152: 0152,
|
||||
E0154: 0154,
|
||||
E0158: 0158,
|
||||
E0161: 0161,
|
||||
E0162: 0162,
|
||||
E0164: 0164,
|
||||
E0165: 0165,
|
||||
E0170: 0170,
|
||||
E0178: 0178,
|
||||
E0183: 0183,
|
||||
E0184: 0184,
|
||||
E0185: 0185,
|
||||
E0186: 0186,
|
||||
E0191: 0191,
|
||||
E0192: 0192,
|
||||
E0193: 0193,
|
||||
E0195: 0195,
|
||||
E0197: 0197,
|
||||
E0198: 0198,
|
||||
E0199: 0199,
|
||||
E0200: 0200,
|
||||
E0201: 0201,
|
||||
E0203: 0203,
|
||||
E0204: 0204,
|
||||
E0205: 0205,
|
||||
E0206: 0206,
|
||||
E0207: 0207,
|
||||
E0208: 0208,
|
||||
E0210: 0210,
|
||||
E0211: 0211,
|
||||
E0212: 0212,
|
||||
E0214: 0214,
|
||||
E0220: 0220,
|
||||
E0221: 0221,
|
||||
E0222: 0222,
|
||||
E0223: 0223,
|
||||
E0224: 0224,
|
||||
E0225: 0225,
|
||||
E0226: 0226,
|
||||
E0227: 0227,
|
||||
E0228: 0228,
|
||||
E0229: 0229,
|
||||
E0230: 0230,
|
||||
E0231: 0231,
|
||||
E0232: 0232,
|
||||
E0243: 0243,
|
||||
E0244: 0244,
|
||||
E0251: 0251,
|
||||
E0252: 0252,
|
||||
E0253: 0253,
|
||||
E0254: 0254,
|
||||
E0255: 0255,
|
||||
E0256: 0256,
|
||||
E0259: 0259,
|
||||
E0260: 0260,
|
||||
E0261: 0261,
|
||||
E0262: 0262,
|
||||
E0263: 0263,
|
||||
E0264: 0264,
|
||||
E0267: 0267,
|
||||
E0268: 0268,
|
||||
E0271: 0271,
|
||||
E0275: 0275,
|
||||
E0276: 0276,
|
||||
E0277: 0277,
|
||||
E0281: 0281,
|
||||
E0282: 0282,
|
||||
E0283: 0283,
|
||||
E0284: 0284,
|
||||
E0297: 0297,
|
||||
E0301: 0301,
|
||||
E0302: 0302,
|
||||
E0303: 0303,
|
||||
E0307: 0307,
|
||||
E0308: 0308,
|
||||
E0309: 0309,
|
||||
E0310: 0310,
|
||||
E0311: 0311,
|
||||
E0312: 0312,
|
||||
E0316: 0316,
|
||||
E0317: 0317,
|
||||
E0320: 0320,
|
||||
E0321: 0321,
|
||||
E0322: 0322,
|
||||
E0323: 0323,
|
||||
E0324: 0324,
|
||||
E0325: 0325,
|
||||
E0326: 0326,
|
||||
E0328: 0328,
|
||||
E0329: 0329,
|
||||
E0364: 0364,
|
||||
E0365: 0365,
|
||||
E0366: 0366,
|
||||
E0367: 0367,
|
||||
E0368: 0368,
|
||||
E0369: 0369,
|
||||
E0370: 0370,
|
||||
E0371: 0371,
|
||||
E0373: 0373,
|
||||
E0374: 0374,
|
||||
E0375: 0375,
|
||||
E0376: 0376,
|
||||
E0377: 0377,
|
||||
E0378: 0378,
|
||||
E0379: 0379,
|
||||
E0380: 0380,
|
||||
E0381: 0381,
|
||||
E0382: 0382,
|
||||
E0383: 0383,
|
||||
E0384: 0384,
|
||||
E0386: 0386,
|
||||
E0387: 0387,
|
||||
E0388: 0388,
|
||||
E0389: 0389,
|
||||
E0390: 0390,
|
||||
E0391: 0391,
|
||||
E0392: 0392,
|
||||
E0393: 0393,
|
||||
E0398: 0398,
|
||||
E0399: 0399,
|
||||
E0401: 0401,
|
||||
E0403: 0403,
|
||||
E0404: 0404,
|
||||
E0405: 0405,
|
||||
E0407: 0407,
|
||||
E0408: 0408,
|
||||
E0409: 0409,
|
||||
E0411: 0411,
|
||||
E0412: 0412,
|
||||
E0415: 0415,
|
||||
E0416: 0416,
|
||||
E0422: 0422,
|
||||
E0423: 0423,
|
||||
E0424: 0424,
|
||||
E0425: 0425,
|
||||
E0426: 0426,
|
||||
E0428: 0428,
|
||||
E0429: 0429,
|
||||
E0430: 0430,
|
||||
E0431: 0431,
|
||||
E0432: 0432,
|
||||
E0433: 0433,
|
||||
E0434: 0434,
|
||||
E0435: 0435,
|
||||
E0436: 0436,
|
||||
E0437: 0437,
|
||||
E0438: 0438,
|
||||
E0439: 0439,
|
||||
E0445: 0445,
|
||||
E0446: 0446,
|
||||
E0447: 0447,
|
||||
E0448: 0448,
|
||||
E0449: 0449,
|
||||
E0451: 0451,
|
||||
E0452: 0452,
|
||||
E0453: 0453,
|
||||
E0454: 0454,
|
||||
E0455: 0455,
|
||||
E0457: 0457,
|
||||
E0458: 0458,
|
||||
E0459: 0459,
|
||||
E0460: 0460,
|
||||
E0461: 0461,
|
||||
E0462: 0462,
|
||||
E0463: 0463,
|
||||
E0464: 0464,
|
||||
E0466: 0466,
|
||||
E0468: 0468,
|
||||
E0469: 0469,
|
||||
E0472: 0472,
|
||||
E0476: 0476,
|
||||
E0477: 0477,
|
||||
E0478: 0478,
|
||||
E0482: 0482,
|
||||
E0491: 0491,
|
||||
E0492: 0492,
|
||||
E0493: 0493,
|
||||
E0495: 0495,
|
||||
E0496: 0496,
|
||||
E0497: 0497,
|
||||
E0498: 0498,
|
||||
E0499: 0499,
|
||||
E0500: 0500,
|
||||
E0501: 0501,
|
||||
E0502: 0502,
|
||||
E0503: 0503,
|
||||
E0504: 0504,
|
||||
E0505: 0505,
|
||||
E0506: 0506,
|
||||
E0507: 0507,
|
||||
E0508: 0508,
|
||||
E0509: 0509,
|
||||
E0510: 0510,
|
||||
E0511: 0511,
|
||||
E0512: 0512,
|
||||
E0514: 0514,
|
||||
E0515: 0515,
|
||||
E0516: 0516,
|
||||
E0517: 0517,
|
||||
E0518: 0518,
|
||||
E0519: 0519,
|
||||
E0520: 0520,
|
||||
E0521: 0521,
|
||||
E0522: 0522,
|
||||
E0523: 0523,
|
||||
E0524: 0524,
|
||||
E0525: 0525,
|
||||
E0527: 0527,
|
||||
E0528: 0528,
|
||||
E0529: 0529,
|
||||
E0530: 0530,
|
||||
E0531: 0531,
|
||||
E0532: 0532,
|
||||
E0533: 0533,
|
||||
E0534: 0534,
|
||||
E0535: 0535,
|
||||
E0536: 0536,
|
||||
E0537: 0537,
|
||||
E0538: 0538,
|
||||
E0539: 0539,
|
||||
E0541: 0541,
|
||||
E0542: 0542,
|
||||
E0543: 0543,
|
||||
E0544: 0544,
|
||||
E0545: 0545,
|
||||
E0546: 0546,
|
||||
E0547: 0547,
|
||||
E0549: 0549,
|
||||
E0550: 0550,
|
||||
E0551: 0551,
|
||||
E0552: 0552,
|
||||
E0554: 0554,
|
||||
E0556: 0556,
|
||||
E0557: 0557,
|
||||
E0559: 0559,
|
||||
E0560: 0560,
|
||||
E0561: 0561,
|
||||
E0562: 0562,
|
||||
E0565: 0565,
|
||||
E0566: 0566,
|
||||
E0567: 0567,
|
||||
E0568: 0568,
|
||||
E0569: 0569,
|
||||
E0570: 0570,
|
||||
E0571: 0571,
|
||||
E0572: 0572,
|
||||
E0573: 0573,
|
||||
E0574: 0574,
|
||||
E0575: 0575,
|
||||
E0576: 0576,
|
||||
E0577: 0577,
|
||||
E0578: 0578,
|
||||
E0579: 0579,
|
||||
E0580: 0580,
|
||||
E0581: 0581,
|
||||
E0582: 0582,
|
||||
E0583: 0583,
|
||||
E0584: 0584,
|
||||
E0585: 0585,
|
||||
E0586: 0586,
|
||||
E0587: 0587,
|
||||
E0588: 0588,
|
||||
E0589: 0589,
|
||||
E0590: 0590,
|
||||
E0591: 0591,
|
||||
E0592: 0592,
|
||||
E0593: 0593,
|
||||
E0594: 0594,
|
||||
E0595: 0595,
|
||||
E0596: 0596,
|
||||
E0597: 0597,
|
||||
E0599: 0599,
|
||||
E0600: 0600,
|
||||
E0601: 0601,
|
||||
E0602: 0602,
|
||||
E0603: 0603,
|
||||
E0604: 0604,
|
||||
E0605: 0605,
|
||||
E0606: 0606,
|
||||
E0607: 0607,
|
||||
E0608: 0608,
|
||||
E0609: 0609,
|
||||
E0610: 0610,
|
||||
E0614: 0614,
|
||||
E0615: 0615,
|
||||
E0616: 0616,
|
||||
E0617: 0617,
|
||||
E0618: 0618,
|
||||
E0619: 0619,
|
||||
E0620: 0620,
|
||||
E0621: 0621,
|
||||
E0622: 0622, // REMOVED: rustc-intrinsic ABI was removed
|
||||
E0623: 0623,
|
||||
E0624: 0624,
|
||||
E0625: 0625,
|
||||
E0626: 0626,
|
||||
E0627: 0627,
|
||||
E0628: 0628,
|
||||
E0631: 0631,
|
||||
E0632: 0632,
|
||||
E0633: 0633,
|
||||
E0634: 0634,
|
||||
E0635: 0635,
|
||||
E0636: 0636,
|
||||
E0637: 0637,
|
||||
E0638: 0638,
|
||||
E0639: 0639,
|
||||
E0640: 0640,
|
||||
E0641: 0641,
|
||||
E0642: 0642,
|
||||
E0643: 0643,
|
||||
E0644: 0644,
|
||||
E0646: 0646,
|
||||
E0647: 0647,
|
||||
E0648: 0648,
|
||||
E0657: 0657,
|
||||
E0658: 0658,
|
||||
E0659: 0659,
|
||||
E0660: 0660,
|
||||
E0661: 0661,
|
||||
E0662: 0662,
|
||||
E0663: 0663,
|
||||
E0664: 0664,
|
||||
E0665: 0665,
|
||||
E0666: 0666,
|
||||
E0667: 0667,
|
||||
E0668: 0668,
|
||||
E0669: 0669,
|
||||
E0670: 0670,
|
||||
E0671: 0671,
|
||||
E0687: 0687,
|
||||
E0688: 0688,
|
||||
E0689: 0689,
|
||||
E0690: 0690,
|
||||
E0691: 0691,
|
||||
E0692: 0692,
|
||||
E0693: 0693,
|
||||
E0695: 0695,
|
||||
E0696: 0696,
|
||||
E0697: 0697,
|
||||
E0698: 0698,
|
||||
E0699: 0699, // REMOVED: merged into generic inference var error
|
||||
E0700: 0700,
|
||||
E0701: 0701,
|
||||
E0703: 0703,
|
||||
E0704: 0704,
|
||||
E0705: 0705,
|
||||
E0706: 0706,
|
||||
E0708: 0708,
|
||||
E0710: 0710,
|
||||
E0712: 0712,
|
||||
E0713: 0713,
|
||||
E0714: 0714,
|
||||
E0715: 0715,
|
||||
E0716: 0716,
|
||||
E0711: 0711,
|
||||
E0717: 0717,
|
||||
E0718: 0718,
|
||||
E0719: 0719,
|
||||
E0720: 0720,
|
||||
E0722: 0722,
|
||||
E0724: 0724,
|
||||
E0725: 0725,
|
||||
E0726: 0726,
|
||||
E0727: 0727,
|
||||
E0728: 0728,
|
||||
E0729: 0729,
|
||||
E0730: 0730,
|
||||
E0731: 0731,
|
||||
E0732: 0732,
|
||||
E0733: 0733,
|
||||
E0734: 0734,
|
||||
E0735: 0735,
|
||||
E0736: 0736,
|
||||
E0737: 0737,
|
||||
E0739: 0739,
|
||||
E0740: 0740,
|
||||
E0741: 0741,
|
||||
E0742: 0742,
|
||||
E0743: 0743,
|
||||
E0744: 0744,
|
||||
E0745: 0745,
|
||||
E0746: 0746,
|
||||
E0747: 0747,
|
||||
E0748: 0748,
|
||||
E0749: 0749,
|
||||
E0750: 0750,
|
||||
E0751: 0751,
|
||||
E0752: 0752,
|
||||
E0753: 0753,
|
||||
E0754: 0754,
|
||||
E0755: 0755,
|
||||
E0756: 0756,
|
||||
E0757: 0757,
|
||||
E0758: 0758,
|
||||
E0759: 0759,
|
||||
E0760: 0760,
|
||||
E0761: 0761,
|
||||
E0762: 0762,
|
||||
E0763: 0763,
|
||||
E0764: 0764,
|
||||
E0765: 0765,
|
||||
E0766: 0766,
|
||||
E0767: 0767,
|
||||
E0768: 0768,
|
||||
E0769: 0769,
|
||||
E0770: 0770,
|
||||
E0771: 0771,
|
||||
E0772: 0772,
|
||||
E0773: 0773,
|
||||
E0774: 0774,
|
||||
E0775: 0775,
|
||||
E0776: 0776,
|
||||
E0777: 0777,
|
||||
E0778: 0778,
|
||||
E0779: 0779,
|
||||
E0780: 0780,
|
||||
E0781: 0781,
|
||||
E0782: 0782,
|
||||
E0783: 0783,
|
||||
E0784: 0784,
|
||||
E0785: 0785,
|
||||
E0786: 0786,
|
||||
E0787: 0787,
|
||||
E0788: 0788,
|
||||
E0789: 0789,
|
||||
E0790: 0790,
|
||||
E0791: 0791,
|
||||
E0792: 0792,
|
||||
E0793: 0793,
|
||||
E0794: 0794,
|
||||
E0795: 0795,
|
||||
E0796: 0796,
|
||||
E0797: 0797,
|
||||
E0798: 0798,
|
||||
E0799: 0799,
|
||||
E0800: 0800,
|
||||
E0801: 0801,
|
||||
E0802: 0802,
|
||||
E0803: 0803,
|
||||
E0804: 0804,
|
||||
E0805: 0805,
|
||||
0001,
|
||||
0002,
|
||||
0004,
|
||||
0005,
|
||||
0007,
|
||||
0009,
|
||||
0010,
|
||||
0013,
|
||||
0014,
|
||||
0015,
|
||||
0023,
|
||||
0025,
|
||||
0026,
|
||||
0027,
|
||||
0029,
|
||||
0030,
|
||||
0033,
|
||||
0034,
|
||||
0038,
|
||||
0040,
|
||||
0044,
|
||||
0045,
|
||||
0046,
|
||||
0049,
|
||||
0050,
|
||||
0053,
|
||||
0054,
|
||||
0055,
|
||||
0057,
|
||||
0059,
|
||||
0060,
|
||||
0061,
|
||||
0062,
|
||||
0063,
|
||||
0067,
|
||||
0069,
|
||||
0070,
|
||||
0071,
|
||||
0072,
|
||||
0073,
|
||||
0074,
|
||||
0075,
|
||||
0076,
|
||||
0077,
|
||||
0080,
|
||||
0081,
|
||||
0084,
|
||||
0087,
|
||||
0088,
|
||||
0089,
|
||||
0090,
|
||||
0091,
|
||||
0092,
|
||||
0093,
|
||||
0094,
|
||||
0106,
|
||||
0107,
|
||||
0109,
|
||||
0110,
|
||||
0116,
|
||||
0117,
|
||||
0118,
|
||||
0119,
|
||||
0120,
|
||||
0121,
|
||||
0124,
|
||||
0128,
|
||||
0130,
|
||||
0131,
|
||||
0132,
|
||||
0133,
|
||||
0136,
|
||||
0137,
|
||||
0138,
|
||||
0139,
|
||||
0152,
|
||||
0154,
|
||||
0158,
|
||||
0161,
|
||||
0162,
|
||||
0164,
|
||||
0165,
|
||||
0170,
|
||||
0178,
|
||||
0183,
|
||||
0184,
|
||||
0185,
|
||||
0186,
|
||||
0191,
|
||||
0192,
|
||||
0193,
|
||||
0195,
|
||||
0197,
|
||||
0198,
|
||||
0199,
|
||||
0200,
|
||||
0201,
|
||||
0203,
|
||||
0204,
|
||||
0205,
|
||||
0206,
|
||||
0207,
|
||||
0208,
|
||||
0210,
|
||||
0211,
|
||||
0212,
|
||||
0214,
|
||||
0220,
|
||||
0221,
|
||||
0222,
|
||||
0223,
|
||||
0224,
|
||||
0225,
|
||||
0226,
|
||||
0227,
|
||||
0228,
|
||||
0229,
|
||||
0230,
|
||||
0231,
|
||||
0232,
|
||||
0243,
|
||||
0244,
|
||||
0251,
|
||||
0252,
|
||||
0253,
|
||||
0254,
|
||||
0255,
|
||||
0256,
|
||||
0259,
|
||||
0260,
|
||||
0261,
|
||||
0262,
|
||||
0263,
|
||||
0264,
|
||||
0267,
|
||||
0268,
|
||||
0271,
|
||||
0275,
|
||||
0276,
|
||||
0277,
|
||||
0281,
|
||||
0282,
|
||||
0283,
|
||||
0284,
|
||||
0297,
|
||||
0301,
|
||||
0302,
|
||||
0303,
|
||||
0307,
|
||||
0308,
|
||||
0309,
|
||||
0310,
|
||||
0311,
|
||||
0312,
|
||||
0316,
|
||||
0317,
|
||||
0320,
|
||||
0321,
|
||||
0322,
|
||||
0323,
|
||||
0324,
|
||||
0325,
|
||||
0326,
|
||||
0328,
|
||||
0329,
|
||||
0364,
|
||||
0365,
|
||||
0366,
|
||||
0367,
|
||||
0368,
|
||||
0369,
|
||||
0370,
|
||||
0371,
|
||||
0373,
|
||||
0374,
|
||||
0375,
|
||||
0376,
|
||||
0377,
|
||||
0378,
|
||||
0379,
|
||||
0380,
|
||||
0381,
|
||||
0382,
|
||||
0383,
|
||||
0384,
|
||||
0386,
|
||||
0387,
|
||||
0388,
|
||||
0389,
|
||||
0390,
|
||||
0391,
|
||||
0392,
|
||||
0393,
|
||||
0398,
|
||||
0399,
|
||||
0401,
|
||||
0403,
|
||||
0404,
|
||||
0405,
|
||||
0407,
|
||||
0408,
|
||||
0409,
|
||||
0411,
|
||||
0412,
|
||||
0415,
|
||||
0416,
|
||||
0422,
|
||||
0423,
|
||||
0424,
|
||||
0425,
|
||||
0426,
|
||||
0428,
|
||||
0429,
|
||||
0430,
|
||||
0431,
|
||||
0432,
|
||||
0433,
|
||||
0434,
|
||||
0435,
|
||||
0436,
|
||||
0437,
|
||||
0438,
|
||||
0439,
|
||||
0445,
|
||||
0446,
|
||||
0447,
|
||||
0448,
|
||||
0449,
|
||||
0451,
|
||||
0452,
|
||||
0453,
|
||||
0454,
|
||||
0455,
|
||||
0457,
|
||||
0458,
|
||||
0459,
|
||||
0460,
|
||||
0461,
|
||||
0462,
|
||||
0463,
|
||||
0464,
|
||||
0466,
|
||||
0468,
|
||||
0469,
|
||||
0472,
|
||||
0476,
|
||||
0477,
|
||||
0478,
|
||||
0482,
|
||||
0491,
|
||||
0492,
|
||||
0493,
|
||||
0495,
|
||||
0496,
|
||||
0497,
|
||||
0498,
|
||||
0499,
|
||||
0500,
|
||||
0501,
|
||||
0502,
|
||||
0503,
|
||||
0504,
|
||||
0505,
|
||||
0506,
|
||||
0507,
|
||||
0508,
|
||||
0509,
|
||||
0510,
|
||||
0511,
|
||||
0512,
|
||||
0514,
|
||||
0515,
|
||||
0516,
|
||||
0517,
|
||||
0518,
|
||||
0519,
|
||||
0520,
|
||||
0521,
|
||||
0522,
|
||||
0523,
|
||||
0524,
|
||||
0525,
|
||||
0527,
|
||||
0528,
|
||||
0529,
|
||||
0530,
|
||||
0531,
|
||||
0532,
|
||||
0533,
|
||||
0534,
|
||||
0535,
|
||||
0536,
|
||||
0537,
|
||||
0538,
|
||||
0539,
|
||||
0541,
|
||||
0542,
|
||||
0543,
|
||||
0544,
|
||||
0545,
|
||||
0546,
|
||||
0547,
|
||||
0549,
|
||||
0550,
|
||||
0551,
|
||||
0552,
|
||||
0554,
|
||||
0556,
|
||||
0557,
|
||||
0559,
|
||||
0560,
|
||||
0561,
|
||||
0562,
|
||||
0565,
|
||||
0566,
|
||||
0567,
|
||||
0568,
|
||||
0569,
|
||||
0570,
|
||||
0571,
|
||||
0572,
|
||||
0573,
|
||||
0574,
|
||||
0575,
|
||||
0576,
|
||||
0577,
|
||||
0578,
|
||||
0579,
|
||||
0580,
|
||||
0581,
|
||||
0582,
|
||||
0583,
|
||||
0584,
|
||||
0585,
|
||||
0586,
|
||||
0587,
|
||||
0588,
|
||||
0589,
|
||||
0590,
|
||||
0591,
|
||||
0592,
|
||||
0593,
|
||||
0594,
|
||||
0595,
|
||||
0596,
|
||||
0597,
|
||||
0599,
|
||||
0600,
|
||||
0601,
|
||||
0602,
|
||||
0603,
|
||||
0604,
|
||||
0605,
|
||||
0606,
|
||||
0607,
|
||||
0608,
|
||||
0609,
|
||||
0610,
|
||||
0614,
|
||||
0615,
|
||||
0616,
|
||||
0617,
|
||||
0618,
|
||||
0619,
|
||||
0620,
|
||||
0621,
|
||||
0622, // REMOVED: rustc-intrinsic ABI was removed
|
||||
0623,
|
||||
0624,
|
||||
0625,
|
||||
0626,
|
||||
0627,
|
||||
0628,
|
||||
0631,
|
||||
0632,
|
||||
0633,
|
||||
0634,
|
||||
0635,
|
||||
0636,
|
||||
0637,
|
||||
0638,
|
||||
0639,
|
||||
0640,
|
||||
0641,
|
||||
0642,
|
||||
0643,
|
||||
0644,
|
||||
0646,
|
||||
0647,
|
||||
0648,
|
||||
0657,
|
||||
0658,
|
||||
0659,
|
||||
0660,
|
||||
0661,
|
||||
0662,
|
||||
0663,
|
||||
0664,
|
||||
0665,
|
||||
0666,
|
||||
0667,
|
||||
0668,
|
||||
0669,
|
||||
0670,
|
||||
0671,
|
||||
0687,
|
||||
0688,
|
||||
0689,
|
||||
0690,
|
||||
0691,
|
||||
0692,
|
||||
0693,
|
||||
0695,
|
||||
0696,
|
||||
0697,
|
||||
0698,
|
||||
0699, // REMOVED: merged into generic inference var error
|
||||
0700,
|
||||
0701,
|
||||
0703,
|
||||
0704,
|
||||
0705,
|
||||
0706,
|
||||
0708,
|
||||
0710,
|
||||
0712,
|
||||
0713,
|
||||
0714,
|
||||
0715,
|
||||
0716,
|
||||
0711,
|
||||
0717,
|
||||
0718,
|
||||
0719,
|
||||
0720,
|
||||
0722,
|
||||
0724,
|
||||
0725,
|
||||
0726,
|
||||
0727,
|
||||
0728,
|
||||
0729,
|
||||
0730,
|
||||
0731,
|
||||
0732,
|
||||
0733,
|
||||
0734,
|
||||
0735,
|
||||
0736,
|
||||
0737,
|
||||
0739,
|
||||
0740,
|
||||
0741,
|
||||
0742,
|
||||
0743,
|
||||
0744,
|
||||
0745,
|
||||
0746,
|
||||
0747,
|
||||
0748,
|
||||
0749,
|
||||
0750,
|
||||
0751,
|
||||
0752,
|
||||
0753,
|
||||
0754,
|
||||
0755,
|
||||
0756,
|
||||
0757,
|
||||
0758,
|
||||
0759,
|
||||
0760,
|
||||
0761,
|
||||
0762,
|
||||
0763,
|
||||
0764,
|
||||
0765,
|
||||
0766,
|
||||
0767,
|
||||
0768,
|
||||
0769,
|
||||
0770,
|
||||
0771,
|
||||
0772,
|
||||
0773, // REMOVED: no longer an error
|
||||
0774,
|
||||
0775,
|
||||
0776,
|
||||
0777,
|
||||
0778,
|
||||
0779,
|
||||
0780,
|
||||
0781,
|
||||
0782,
|
||||
0783,
|
||||
0784,
|
||||
0785,
|
||||
0786,
|
||||
0787,
|
||||
0788,
|
||||
0789,
|
||||
0790,
|
||||
0791,
|
||||
0792,
|
||||
0793,
|
||||
0794,
|
||||
0795,
|
||||
0796,
|
||||
0797,
|
||||
0798,
|
||||
0799,
|
||||
0800,
|
||||
0801,
|
||||
0802,
|
||||
0803,
|
||||
0804,
|
||||
0805,
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
@@ -23,15 +23,15 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
rustc_error_messages::into_diag_arg_using_display!(ErrCode);
|
||||
|
||||
macro_rules! define_error_code_constants_and_diagnostics_table {
|
||||
($($name:ident: $num:literal,)*) => (
|
||||
($($num:literal,)*) => (
|
||||
$(
|
||||
pub const $name: $crate::ErrCode = $crate::ErrCode::from_u32($num);
|
||||
pub const ${concat(E, $num)}: $crate::ErrCode = $crate::ErrCode::from_u32($num);
|
||||
)*
|
||||
pub static DIAGNOSTICS: &[($crate::ErrCode, &str)] = &[
|
||||
$( (
|
||||
$name,
|
||||
${concat(E, $num)},
|
||||
include_str!(
|
||||
concat!("../../rustc_error_codes/src/error_codes/", stringify!($name), ".md")
|
||||
concat!("../../rustc_error_codes/src/error_codes/E", stringify!($num), ".md")
|
||||
)
|
||||
), )*
|
||||
];
|
||||
|
||||
@@ -474,9 +474,12 @@ fn fix_multispan_in_extern_macros(&self, span: &mut MultiSpan) {
|
||||
.chain(span.span_labels().iter().map(|sp_label| sp_label.span))
|
||||
.filter_map(|sp| {
|
||||
if !sp.is_dummy() && source_map.is_imported(sp) {
|
||||
let maybe_callsite = sp.source_callsite();
|
||||
if sp != maybe_callsite {
|
||||
return Some((sp, maybe_callsite));
|
||||
let mut span = sp;
|
||||
while let Some(callsite) = span.parent_callsite() {
|
||||
span = callsite;
|
||||
if !source_map.is_imported(span) {
|
||||
return Some((sp, span));
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#![feature(box_patterns)]
|
||||
#![feature(default_field_values)]
|
||||
#![feature(error_reporter)]
|
||||
#![feature(macro_metavar_expr_concat)]
|
||||
#![feature(negative_impls)]
|
||||
#![feature(never_type)]
|
||||
#![feature(rustc_attrs)]
|
||||
|
||||
@@ -73,6 +73,7 @@
|
||||
ResolverGlobalCtxt, TyCtxt, TyCtxtFeed, Visibility,
|
||||
};
|
||||
use rustc_query_system::ich::StableHashingContext;
|
||||
use rustc_session::config::CrateType;
|
||||
use rustc_session::lint::builtin::PRIVATE_MACRO_USE;
|
||||
use rustc_span::hygiene::{ExpnId, LocalExpnId, MacroKind, SyntaxContext, Transparency};
|
||||
use rustc_span::{DUMMY_SP, Ident, Macros20NormalizedIdent, Span, Symbol, kw, sym};
|
||||
@@ -2430,6 +2431,12 @@ fn legacy_const_generic_args(&mut self, expr: &Expr) -> Option<Vec<usize>> {
|
||||
}
|
||||
|
||||
fn resolve_main(&mut self) {
|
||||
let any_exe = self.tcx.crate_types().contains(&CrateType::Executable);
|
||||
// Don't try to resolve main unless it's an executable
|
||||
if !any_exe {
|
||||
return;
|
||||
}
|
||||
|
||||
let module = self.graph_root;
|
||||
let ident = Ident::with_dummy_span(sym::main);
|
||||
let parent_scope = &ParentScope::module(module, self.arenas);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:22.04
|
||||
FROM ghcr.io/rust-lang/ubuntu:24.04
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/rust-lang/ubuntu:22.04
|
||||
FROM ghcr.io/rust-lang/ubuntu:24.04
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
|
||||
@@ -63,6 +63,15 @@ pub(crate) enum InputMode {
|
||||
HasFile(Input),
|
||||
}
|
||||
|
||||
/// Whether to run multiple doctests in the same binary.
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
|
||||
pub(crate) enum MergeDoctests {
|
||||
#[default]
|
||||
Never,
|
||||
Always,
|
||||
Auto,
|
||||
}
|
||||
|
||||
/// Configuration options for rustdoc.
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct Options {
|
||||
@@ -121,6 +130,8 @@ pub(crate) struct Options {
|
||||
/// Optional path to persist the doctest executables to, defaults to a
|
||||
/// temporary directory if not set.
|
||||
pub(crate) persist_doctests: Option<PathBuf>,
|
||||
/// Whether to merge
|
||||
pub(crate) merge_doctests: MergeDoctests,
|
||||
/// Runtool to run doctests with
|
||||
pub(crate) test_runtool: Option<String>,
|
||||
/// Arguments to pass to the runtool
|
||||
@@ -801,6 +812,8 @@ fn println_condition(condition: Condition) {
|
||||
Ok(result) => result,
|
||||
Err(e) => dcx.fatal(format!("--merge option error: {e}")),
|
||||
};
|
||||
let merge_doctests = parse_merge_doctests(matches, edition, dcx);
|
||||
tracing::debug!("merge_doctests: {merge_doctests:?}");
|
||||
|
||||
if generate_link_to_definition && (show_coverage || output_format != OutputFormat::Html) {
|
||||
dcx.struct_warn(
|
||||
@@ -852,6 +865,7 @@ fn println_condition(condition: Condition) {
|
||||
crate_version,
|
||||
test_run_directory,
|
||||
persist_doctests,
|
||||
merge_doctests,
|
||||
test_runtool,
|
||||
test_runtool_args,
|
||||
test_builder,
|
||||
@@ -1048,3 +1062,20 @@ fn parse_merge(m: &getopts::Matches) -> Result<ShouldMerge, &'static str> {
|
||||
Some(_) => Err("argument to --merge must be `none`, `shared`, or `finalize`"),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_merge_doctests(
|
||||
m: &getopts::Matches,
|
||||
edition: Edition,
|
||||
dcx: DiagCtxtHandle<'_>,
|
||||
) -> MergeDoctests {
|
||||
match m.opt_str("merge-doctests").as_deref() {
|
||||
Some("y") | Some("yes") | Some("on") | Some("true") => MergeDoctests::Always,
|
||||
Some("n") | Some("no") | Some("off") | Some("false") => MergeDoctests::Never,
|
||||
Some("auto") => MergeDoctests::Auto,
|
||||
None if edition < Edition::Edition2024 => MergeDoctests::Never,
|
||||
None => MergeDoctests::Auto,
|
||||
Some(_) => {
|
||||
dcx.fatal("argument to --merge-doctests must be a boolean (true/false) or 'auto'")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+34
-16
@@ -35,7 +35,7 @@
|
||||
use tracing::debug;
|
||||
|
||||
use self::rust::HirCollector;
|
||||
use crate::config::{Options as RustdocOptions, OutputFormat};
|
||||
use crate::config::{MergeDoctests, Options as RustdocOptions, OutputFormat};
|
||||
use crate::html::markdown::{ErrorCodes, Ignore, LangString, MdRelLine};
|
||||
use crate::lint::init_lints;
|
||||
|
||||
@@ -125,8 +125,13 @@ pub(crate) fn generate_args_file(file_path: &Path, options: &RustdocOptions) ->
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn get_doctest_dir() -> io::Result<TempDir> {
|
||||
TempFileBuilder::new().prefix("rustdoctest").tempdir()
|
||||
fn get_doctest_dir(opts: &RustdocOptions) -> io::Result<TempDir> {
|
||||
let mut builder = TempFileBuilder::new();
|
||||
builder.prefix("rustdoctest");
|
||||
if opts.codegen_options.save_temps {
|
||||
builder.disable_cleanup(true);
|
||||
}
|
||||
builder.tempdir()
|
||||
}
|
||||
|
||||
pub(crate) fn run(dcx: DiagCtxtHandle<'_>, input: Input, options: RustdocOptions) {
|
||||
@@ -199,7 +204,7 @@ pub(crate) fn run(dcx: DiagCtxtHandle<'_>, input: Input, options: RustdocOptions
|
||||
let externs = options.externs.clone();
|
||||
let json_unused_externs = options.json_unused_externs;
|
||||
|
||||
let temp_dir = match get_doctest_dir()
|
||||
let temp_dir = match get_doctest_dir(&options)
|
||||
.map_err(|error| format!("failed to create temporary directory: {error:?}"))
|
||||
{
|
||||
Ok(temp_dir) => temp_dir,
|
||||
@@ -209,6 +214,7 @@ pub(crate) fn run(dcx: DiagCtxtHandle<'_>, input: Input, options: RustdocOptions
|
||||
crate::wrap_return(dcx, generate_args_file(&args_path, &options));
|
||||
|
||||
let extract_doctests = options.output_format == OutputFormat::Doctest;
|
||||
let save_temps = options.codegen_options.save_temps;
|
||||
let result = interface::run_compiler(config, |compiler| {
|
||||
let krate = rustc_interface::passes::parse(&compiler.sess);
|
||||
|
||||
@@ -260,12 +266,15 @@ pub(crate) fn run(dcx: DiagCtxtHandle<'_>, input: Input, options: RustdocOptions
|
||||
eprintln!("{error}");
|
||||
// Since some files in the temporary folder are still owned and alive, we need
|
||||
// to manually remove the folder.
|
||||
let _ = std::fs::remove_dir_all(temp_dir.path());
|
||||
if !save_temps {
|
||||
let _ = std::fs::remove_dir_all(temp_dir.path());
|
||||
}
|
||||
std::process::exit(1);
|
||||
}
|
||||
};
|
||||
|
||||
run_tests(
|
||||
dcx,
|
||||
opts,
|
||||
&rustdoc_options,
|
||||
&unused_extern_reports,
|
||||
@@ -317,6 +326,7 @@ pub(crate) fn run(dcx: DiagCtxtHandle<'_>, input: Input, options: RustdocOptions
|
||||
}
|
||||
|
||||
pub(crate) fn run_tests(
|
||||
dcx: DiagCtxtHandle<'_>,
|
||||
opts: GlobalTestOptions,
|
||||
rustdoc_options: &Arc<RustdocOptions>,
|
||||
unused_extern_reports: &Arc<Mutex<Vec<UnusedExterns>>>,
|
||||
@@ -369,6 +379,13 @@ pub(crate) fn run_tests(
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if rustdoc_options.merge_doctests == MergeDoctests::Always {
|
||||
let mut diag = dcx.struct_fatal("failed to merge doctests");
|
||||
diag.note("requested explicitly on the command line with `--merge-doctests=yes`");
|
||||
diag.emit();
|
||||
}
|
||||
|
||||
// We failed to compile all compatible tests as one so we push them into the
|
||||
// `standalone_tests` doctests.
|
||||
debug!("Failed to compile compatible doctests for edition {} all at once", edition);
|
||||
@@ -653,9 +670,9 @@ fn run_test(
|
||||
// tested as standalone tests.
|
||||
return (Duration::default(), Err(TestFailure::CompileError));
|
||||
}
|
||||
if !rustdoc_options.no_capture {
|
||||
// If `no_capture` is disabled, then we don't display rustc's output when compiling
|
||||
// the merged doctests.
|
||||
if !rustdoc_options.no_capture && rustdoc_options.merge_doctests == MergeDoctests::Auto {
|
||||
// If `no_capture` is disabled, and we might fallback to standalone tests, then we don't
|
||||
// display rustc's output when compiling the merged doctests.
|
||||
compiler.stderr(Stdio::null());
|
||||
}
|
||||
// bundled tests are an rlib, loaded by a separate runner executable
|
||||
@@ -736,10 +753,12 @@ fn run_test(
|
||||
// tested as standalone tests.
|
||||
return (instant.elapsed(), Err(TestFailure::CompileError));
|
||||
}
|
||||
if !rustdoc_options.no_capture {
|
||||
// If `no_capture` is disabled, then we don't display rustc's output when compiling
|
||||
// the merged doctests.
|
||||
if !rustdoc_options.no_capture && rustdoc_options.merge_doctests == MergeDoctests::Auto {
|
||||
// If `no_capture` is disabled and we're autodetecting whether to merge,
|
||||
// we don't display rustc's output when compiling the merged doctests.
|
||||
runner_compiler.stderr(Stdio::null());
|
||||
} else {
|
||||
runner_compiler.stderr(Stdio::inherit());
|
||||
}
|
||||
runner_compiler.arg("--error-format=short");
|
||||
debug!("compiler invocation for doctest runner: {runner_compiler:?}");
|
||||
@@ -896,7 +915,7 @@ fn new(options: &RustdocOptions, test_id: &Option<String>, test_path: PathBuf) -
|
||||
|
||||
DirState::Perm(path)
|
||||
} else {
|
||||
DirState::Temp(get_doctest_dir().expect("rustdoc needs a tempdir"))
|
||||
DirState::Temp(get_doctest_dir(options).expect("rustdoc needs a tempdir"))
|
||||
};
|
||||
|
||||
Self { outdir, path: test_path }
|
||||
@@ -985,21 +1004,20 @@ struct CreateRunnableDocTests {
|
||||
visited_tests: FxHashMap<(String, usize), usize>,
|
||||
unused_extern_reports: Arc<Mutex<Vec<UnusedExterns>>>,
|
||||
compiling_test_count: AtomicUsize,
|
||||
can_merge_doctests: bool,
|
||||
can_merge_doctests: MergeDoctests,
|
||||
}
|
||||
|
||||
impl CreateRunnableDocTests {
|
||||
fn new(rustdoc_options: RustdocOptions, opts: GlobalTestOptions) -> CreateRunnableDocTests {
|
||||
let can_merge_doctests = rustdoc_options.edition >= Edition::Edition2024;
|
||||
CreateRunnableDocTests {
|
||||
standalone_tests: Vec::new(),
|
||||
mergeable_tests: FxIndexMap::default(),
|
||||
rustdoc_options: Arc::new(rustdoc_options),
|
||||
opts,
|
||||
visited_tests: FxHashMap::default(),
|
||||
unused_extern_reports: Default::default(),
|
||||
compiling_test_count: AtomicUsize::new(0),
|
||||
can_merge_doctests,
|
||||
can_merge_doctests: rustdoc_options.merge_doctests,
|
||||
rustdoc_options: Arc::new(rustdoc_options),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
use tracing::debug;
|
||||
|
||||
use super::GlobalTestOptions;
|
||||
use crate::config::MergeDoctests;
|
||||
use crate::display::Joined as _;
|
||||
use crate::html::markdown::LangString;
|
||||
|
||||
@@ -41,7 +42,7 @@ pub(crate) struct BuildDocTestBuilder<'a> {
|
||||
source: &'a str,
|
||||
crate_name: Option<&'a str>,
|
||||
edition: Edition,
|
||||
can_merge_doctests: bool,
|
||||
can_merge_doctests: MergeDoctests,
|
||||
// If `test_id` is `None`, it means we're generating code for a code example "run" link.
|
||||
test_id: Option<String>,
|
||||
lang_str: Option<&'a LangString>,
|
||||
@@ -55,7 +56,7 @@ pub(crate) fn new(source: &'a str) -> Self {
|
||||
source,
|
||||
crate_name: None,
|
||||
edition: DEFAULT_EDITION,
|
||||
can_merge_doctests: false,
|
||||
can_merge_doctests: MergeDoctests::Never,
|
||||
test_id: None,
|
||||
lang_str: None,
|
||||
span: DUMMY_SP,
|
||||
@@ -70,7 +71,7 @@ pub(crate) fn crate_name(mut self, crate_name: &'a str) -> Self {
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub(crate) fn can_merge_doctests(mut self, can_merge_doctests: bool) -> Self {
|
||||
pub(crate) fn can_merge_doctests(mut self, can_merge_doctests: MergeDoctests) -> Self {
|
||||
self.can_merge_doctests = can_merge_doctests;
|
||||
self
|
||||
}
|
||||
@@ -117,10 +118,6 @@ pub(crate) fn build(self, dcx: Option<DiagCtxtHandle<'_>>) -> DocTestBuilder {
|
||||
span,
|
||||
global_crate_attrs,
|
||||
} = self;
|
||||
let can_merge_doctests = can_merge_doctests
|
||||
&& lang_str.is_some_and(|lang_str| {
|
||||
!lang_str.compile_fail && !lang_str.test_harness && !lang_str.standalone_crate
|
||||
});
|
||||
|
||||
let result = rustc_driver::catch_fatal_errors(|| {
|
||||
rustc_span::create_session_if_not_set_then(edition, |_| {
|
||||
@@ -155,14 +152,27 @@ pub(crate) fn build(self, dcx: Option<DiagCtxtHandle<'_>>) -> DocTestBuilder {
|
||||
debug!("crate_attrs:\n{crate_attrs}{maybe_crate_attrs}");
|
||||
debug!("crates:\n{crates}");
|
||||
debug!("after:\n{everything_else}");
|
||||
debug!("merge-doctests: {can_merge_doctests:?}");
|
||||
|
||||
// If it contains `#[feature]` or `#[no_std]`, we don't want it to be merged either.
|
||||
let can_be_merged = can_merge_doctests
|
||||
&& !has_global_allocator
|
||||
&& crate_attrs.is_empty()
|
||||
// If this is a merged doctest and a defined macro uses `$crate`, then the path will
|
||||
// not work, so better not put it into merged doctests.
|
||||
&& !(has_macro_def && everything_else.contains("$crate"));
|
||||
// Up until now, we've been dealing with settings for the whole crate.
|
||||
// Now, infer settings for this particular test.
|
||||
//
|
||||
// Avoid tests with incompatible attributes.
|
||||
let opt_out = lang_str.is_some_and(|lang_str| {
|
||||
lang_str.compile_fail || lang_str.test_harness || lang_str.standalone_crate
|
||||
});
|
||||
let can_be_merged = if can_merge_doctests == MergeDoctests::Auto {
|
||||
// We try to look at the contents of the test to detect whether it should be merged.
|
||||
// This is not a complete list of possible failures, but it catches many cases.
|
||||
let will_probably_fail = has_global_allocator
|
||||
|| !crate_attrs.is_empty()
|
||||
// If this is a merged doctest and a defined macro uses `$crate`, then the path will
|
||||
// not work, so better not put it into merged doctests.
|
||||
|| (has_macro_def && everything_else.contains("$crate"));
|
||||
!opt_out && !will_probably_fail
|
||||
} else {
|
||||
can_merge_doctests != MergeDoctests::Never && !opt_out
|
||||
};
|
||||
DocTestBuilder {
|
||||
supports_color,
|
||||
has_main_fn,
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
use std::fs::read_to_string;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use rustc_errors::DiagCtxtHandle;
|
||||
use rustc_session::config::Input;
|
||||
use rustc_span::{DUMMY_SP, FileName};
|
||||
use tempfile::tempdir;
|
||||
@@ -78,7 +79,7 @@ fn visit_header(&mut self, name: &str, level: u32) {
|
||||
}
|
||||
|
||||
/// Runs any tests/code examples in the markdown file `options.input`.
|
||||
pub(crate) fn test(input: &Input, options: Options) -> Result<(), String> {
|
||||
pub(crate) fn test(input: &Input, options: Options, dcx: DiagCtxtHandle<'_>) -> Result<(), String> {
|
||||
let input_str = match input {
|
||||
Input::File(path) => {
|
||||
read_to_string(path).map_err(|err| format!("{}: {err}", path.display()))?
|
||||
@@ -118,6 +119,7 @@ pub(crate) fn test(input: &Input, options: Options) -> Result<(), String> {
|
||||
let CreateRunnableDocTests { opts, rustdoc_options, standalone_tests, mergeable_tests, .. } =
|
||||
collector;
|
||||
crate::doctest::run_tests(
|
||||
dcx,
|
||||
opts,
|
||||
&rustdoc_options,
|
||||
&Arc::new(Mutex::new(Vec::new())),
|
||||
|
||||
@@ -76,4 +76,8 @@ pub(crate) fn is_on_local_type(&self, cx: &Context<'_>) -> bool {
|
||||
};
|
||||
true
|
||||
}
|
||||
|
||||
pub(crate) fn is_negative_trait_impl(&self) -> bool {
|
||||
self.inner_impl().is_negative_trait_impl()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -646,6 +646,27 @@ fn item_function(cx: &Context<'_>, it: &clean::Item, f: &clean::Function) -> imp
|
||||
})
|
||||
}
|
||||
|
||||
/// Struct used to handle insertion of "negative impl" marker in the generated DOM.
|
||||
///
|
||||
/// This marker appears once in all trait impl lists to divide negative impls from positive impls.
|
||||
struct NegativeMarker {
|
||||
inserted: bool,
|
||||
}
|
||||
|
||||
impl NegativeMarker {
|
||||
fn new() -> Self {
|
||||
Self { inserted: false }
|
||||
}
|
||||
|
||||
fn insert_if_needed(&mut self, w: &mut fmt::Formatter<'_>, implementor: &Impl) -> fmt::Result {
|
||||
if !self.inserted && !implementor.is_negative_trait_impl() {
|
||||
w.write_str("<div class=\"negative-marker\"></div>")?;
|
||||
self.inserted = true;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn item_trait(cx: &Context<'_>, it: &clean::Item, t: &clean::Trait) -> impl fmt::Display {
|
||||
fmt::from_fn(|w| {
|
||||
let tcx = cx.tcx();
|
||||
@@ -1072,7 +1093,9 @@ fn trait_item(cx: &Context<'_>, m: &clean::Item, t: &clean::Item) -> impl fmt::D
|
||||
"<div id=\"implementors-list\">",
|
||||
)
|
||||
)?;
|
||||
let mut negative_marker = NegativeMarker::new();
|
||||
for implementor in concrete {
|
||||
negative_marker.insert_if_needed(w, implementor)?;
|
||||
write!(w, "{}", render_implementor(cx, implementor, it, &implementor_dups, &[]))?;
|
||||
}
|
||||
w.write_str("</div>")?;
|
||||
@@ -1088,7 +1111,9 @@ fn trait_item(cx: &Context<'_>, m: &clean::Item, t: &clean::Item) -> impl fmt::D
|
||||
"<div id=\"synthetic-implementors-list\">",
|
||||
)
|
||||
)?;
|
||||
let mut negative_marker = NegativeMarker::new();
|
||||
for implementor in synthetic {
|
||||
negative_marker.insert_if_needed(w, implementor)?;
|
||||
write!(
|
||||
w,
|
||||
"{}",
|
||||
@@ -2302,11 +2327,18 @@ fn wrap_item<W, F>(w: &mut W, f: F) -> fmt::Result
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq)]
|
||||
struct ImplString(String);
|
||||
struct ImplString {
|
||||
rendered: String,
|
||||
is_negative: bool,
|
||||
}
|
||||
|
||||
impl ImplString {
|
||||
fn new(i: &Impl, cx: &Context<'_>) -> ImplString {
|
||||
ImplString(format!("{}", print_impl(i.inner_impl(), false, cx)))
|
||||
let impl_ = i.inner_impl();
|
||||
ImplString {
|
||||
is_negative: impl_.is_negative_trait_impl(),
|
||||
rendered: format!("{}", print_impl(impl_, false, cx)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2318,7 +2350,12 @@ fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
||||
|
||||
impl Ord for ImplString {
|
||||
fn cmp(&self, other: &Self) -> Ordering {
|
||||
compare_names(&self.0, &other.0)
|
||||
// We sort negative impls first.
|
||||
match (self.is_negative, other.is_negative) {
|
||||
(false, true) => Ordering::Greater,
|
||||
(true, false) => Ordering::Less,
|
||||
_ => compare_names(&self.rendered, &other.rendered),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
//! or contains "invocation-specific".
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::cmp::Ordering;
|
||||
use std::ffi::{OsStr, OsString};
|
||||
use std::fs::File;
|
||||
use std::io::{self, Write as _};
|
||||
@@ -47,6 +48,7 @@
|
||||
use crate::html::format::{print_impl, print_path};
|
||||
use crate::html::layout;
|
||||
use crate::html::render::ordered_json::{EscapedJson, OrderedJson};
|
||||
use crate::html::render::print_item::compare_names;
|
||||
use crate::html::render::search_index::{SerializedSearchIndex, build_index};
|
||||
use crate::html::render::sorted_template::{self, FileFormat, SortedTemplate};
|
||||
use crate::html::render::{AssocItemLink, ImplRenderingParameters, StylePath};
|
||||
@@ -667,7 +669,7 @@ impl TraitAliasPart {
|
||||
fn blank() -> SortedTemplate<<Self as CciPart>::FileFormat> {
|
||||
SortedTemplate::from_before_after(
|
||||
r"(function() {
|
||||
var implementors = Object.fromEntries([",
|
||||
const implementors = Object.fromEntries([",
|
||||
r"]);
|
||||
if (window.register_implementors) {
|
||||
window.register_implementors(implementors);
|
||||
@@ -720,10 +722,12 @@ fn get(
|
||||
{
|
||||
None
|
||||
} else {
|
||||
let impl_ = imp.inner_impl();
|
||||
Some(Implementor {
|
||||
text: print_impl(imp.inner_impl(), false, cx).to_string(),
|
||||
text: print_impl(impl_, false, cx).to_string(),
|
||||
synthetic: imp.inner_impl().kind.is_auto(),
|
||||
types: collect_paths_for_type(&imp.inner_impl().for_, cache),
|
||||
is_negative: impl_.is_negative_trait_impl(),
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -742,8 +746,22 @@ fn get(
|
||||
}
|
||||
path.push(format!("{remote_item_type}.{}.js", remote_path[remote_path.len() - 1]));
|
||||
|
||||
let part = OrderedJson::array_sorted(
|
||||
implementors.map(|implementor| OrderedJson::serialize(implementor).unwrap()),
|
||||
let mut implementors = implementors.collect::<Vec<_>>();
|
||||
implementors.sort_unstable_by(|a, b| {
|
||||
// We sort negative impls first.
|
||||
match (a.is_negative, b.is_negative) {
|
||||
(false, true) => Ordering::Greater,
|
||||
(true, false) => Ordering::Less,
|
||||
_ => compare_names(&a.text, &b.text),
|
||||
}
|
||||
});
|
||||
|
||||
let part = OrderedJson::array_unsorted(
|
||||
implementors
|
||||
.iter()
|
||||
.map(OrderedJson::serialize)
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
.unwrap(),
|
||||
);
|
||||
path_parts.push(path, OrderedJson::array_unsorted([crate_name_json, &part]));
|
||||
}
|
||||
@@ -755,6 +773,7 @@ struct Implementor {
|
||||
text: String,
|
||||
synthetic: bool,
|
||||
types: Vec<String>,
|
||||
is_negative: bool,
|
||||
}
|
||||
|
||||
impl Serialize for Implementor {
|
||||
@@ -764,6 +783,7 @@ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
{
|
||||
let mut seq = serializer.serialize_seq(None)?;
|
||||
seq.serialize_element(&self.text)?;
|
||||
seq.serialize_element(if self.is_negative { &1 } else { &0 })?;
|
||||
if self.synthetic {
|
||||
seq.serialize_element(&1)?;
|
||||
seq.serialize_element(&self.types)?;
|
||||
|
||||
@@ -68,7 +68,7 @@ fn trait_alias_template() {
|
||||
assert_eq!(
|
||||
but_last_line(&template.to_string()),
|
||||
r#"(function() {
|
||||
var implementors = Object.fromEntries([]);
|
||||
const implementors = Object.fromEntries([]);
|
||||
if (window.register_implementors) {
|
||||
window.register_implementors(implementors);
|
||||
} else {
|
||||
@@ -80,7 +80,7 @@ fn trait_alias_template() {
|
||||
assert_eq!(
|
||||
but_last_line(&template.to_string()),
|
||||
r#"(function() {
|
||||
var implementors = Object.fromEntries([["a"]]);
|
||||
const implementors = Object.fromEntries([["a"]]);
|
||||
if (window.register_implementors) {
|
||||
window.register_implementors(implementors);
|
||||
} else {
|
||||
@@ -92,7 +92,7 @@ fn trait_alias_template() {
|
||||
assert_eq!(
|
||||
but_last_line(&template.to_string()),
|
||||
r#"(function() {
|
||||
var implementors = Object.fromEntries([["a"],["b"]]);
|
||||
const implementors = Object.fromEntries([["a"],["b"]]);
|
||||
if (window.register_implementors) {
|
||||
window.register_implementors(implementors);
|
||||
} else {
|
||||
|
||||
@@ -29,6 +29,10 @@ nav.sub {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#synthetic-implementors-list:not(.loaded), #implementors-list:not(.loaded) {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Begin: styles for themes
|
||||
Keep the default light and dark themes synchronized with the ones
|
||||
in rustdoc.css */
|
||||
|
||||
@@ -1158,6 +1158,12 @@ div.where {
|
||||
margin-left: calc(var(--docblock-indent) + var(--impl-items-indent));
|
||||
}
|
||||
|
||||
#synthetic-implementors-list:not(.loaded), #implementors-list:not(.loaded) {
|
||||
/* To prevent layout shift when loading the page with extra implementors being loaded
|
||||
from JS, we hide the list until it's complete. */
|
||||
display: none;
|
||||
}
|
||||
|
||||
.item-info code {
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
@@ -2976,6 +2982,9 @@ in src-script.js and main.js
|
||||
{
|
||||
margin-bottom: 0.75em;
|
||||
}
|
||||
.negative-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.variants > .docblock,
|
||||
.implementors-toggle > .docblock,
|
||||
|
||||
@@ -800,21 +800,34 @@ function preLoadCss(cssUrl) {
|
||||
|
||||
// <https://github.com/search?q=repo%3Arust-lang%2Frust+[RUSTDOCIMPL]+trait.impl&type=code>
|
||||
window.register_implementors = imp => {
|
||||
const implementors = document.getElementById("implementors-list");
|
||||
const synthetic_implementors = document.getElementById("synthetic-implementors-list");
|
||||
/** Takes an ID as input and returns a list of two elements. The first element is the DOM
|
||||
* element with the given ID and the second is the "negative marker", meaning the location
|
||||
* between the negative and non-negative impls.
|
||||
*
|
||||
* @param {string} id: ID of the DOM element.
|
||||
*
|
||||
* @return {[HTMLElement|null, HTMLElement|null]}
|
||||
*/
|
||||
function implementorsElems(id) {
|
||||
const elem = document.getElementById(id);
|
||||
return [elem, elem ? elem.querySelector(".negative-marker") : null];
|
||||
}
|
||||
const implementors = implementorsElems("implementors-list");
|
||||
const syntheticImplementors = implementorsElems("synthetic-implementors-list");
|
||||
const inlined_types = new Set();
|
||||
|
||||
const TEXT_IDX = 0;
|
||||
const SYNTHETIC_IDX = 1;
|
||||
const TYPES_IDX = 2;
|
||||
const IS_NEG_IDX = 1;
|
||||
const SYNTHETIC_IDX = 2;
|
||||
const TYPES_IDX = 3;
|
||||
|
||||
if (synthetic_implementors) {
|
||||
if (syntheticImplementors[0]) {
|
||||
// This `inlined_types` variable is used to avoid having the same implementation
|
||||
// showing up twice. For example "String" in the "Sync" doc page.
|
||||
//
|
||||
// By the way, this is only used by and useful for traits implemented automatically
|
||||
// (like "Send" and "Sync").
|
||||
onEachLazy(synthetic_implementors.getElementsByClassName("impl"), el => {
|
||||
onEachLazy(syntheticImplementors[0].getElementsByClassName("impl"), el => {
|
||||
const aliases = el.getAttribute("data-aliases");
|
||||
if (!aliases) {
|
||||
return;
|
||||
@@ -827,7 +840,7 @@ function preLoadCss(cssUrl) {
|
||||
}
|
||||
|
||||
// @ts-expect-error
|
||||
let currentNbImpls = implementors.getElementsByClassName("impl").length;
|
||||
let currentNbImpls = implementors[0].getElementsByClassName("impl").length;
|
||||
// @ts-expect-error
|
||||
const traitName = document.querySelector(".main-heading h1 > .trait").textContent;
|
||||
const baseIdName = "impl-" + traitName + "-";
|
||||
@@ -849,7 +862,7 @@ function preLoadCss(cssUrl) {
|
||||
|
||||
struct_loop:
|
||||
for (const struct of structs) {
|
||||
const list = struct[SYNTHETIC_IDX] ? synthetic_implementors : implementors;
|
||||
const list = struct[SYNTHETIC_IDX] ? syntheticImplementors : implementors;
|
||||
|
||||
// The types list is only used for synthetic impls.
|
||||
// If this changes, `main.js` and `write_shared.rs` both need changed.
|
||||
@@ -884,11 +897,25 @@ function preLoadCss(cssUrl) {
|
||||
addClass(display, "impl");
|
||||
display.appendChild(anchor);
|
||||
display.appendChild(code);
|
||||
// @ts-expect-error
|
||||
list.appendChild(display);
|
||||
|
||||
// If this is a negative implementor, we put it into the right location (just
|
||||
// before the negative impl marker).
|
||||
if (struct[IS_NEG_IDX]) {
|
||||
// @ts-expect-error
|
||||
list[1].before(display);
|
||||
} else {
|
||||
// @ts-expect-error
|
||||
list[0].appendChild(display);
|
||||
}
|
||||
currentNbImpls += 1;
|
||||
}
|
||||
}
|
||||
if (implementors[0]) {
|
||||
implementors[0].classList.add("loaded");
|
||||
}
|
||||
if (syntheticImplementors[0]) {
|
||||
syntheticImplementors[0].classList.add("loaded");
|
||||
}
|
||||
};
|
||||
if (window.pending_implementors) {
|
||||
window.register_implementors(window.pending_implementors);
|
||||
|
||||
+1
-1
@@ -520,7 +520,7 @@ declare namespace rustdoc {
|
||||
* Provided by generated `trait.impl` files.
|
||||
*/
|
||||
type Implementors = {
|
||||
[key: string]: Array<[string, number, Array<string>]>
|
||||
[key: string]: Array<[string, 0|1, number, Array<string>]>
|
||||
}
|
||||
|
||||
type TypeImpls = {
|
||||
|
||||
@@ -544,6 +544,14 @@ fn opts() -> Vec<RustcOptGroup> {
|
||||
"[toolchain-shared-resources,invocation-specific,dep-info]",
|
||||
),
|
||||
opt(Unstable, FlagMulti, "", "no-run", "Compile doctests without running them", ""),
|
||||
opt(
|
||||
Unstable,
|
||||
Opt,
|
||||
"",
|
||||
"merge-doctests",
|
||||
"Force all doctests to be compiled as a single binary, instead of one binary per test. If merging fails, rustdoc will emit a hard error.",
|
||||
"yes|no|auto",
|
||||
),
|
||||
opt(
|
||||
Unstable,
|
||||
Multi,
|
||||
@@ -822,7 +830,7 @@ fn main_args(early_dcx: &mut EarlyDiagCtxt, at_args: &[String]) {
|
||||
options.should_test || output_format == config::OutputFormat::Doctest,
|
||||
config::markdown_input(&input),
|
||||
) {
|
||||
(true, Some(_)) => return wrap_return(dcx, doctest::test_markdown(&input, options)),
|
||||
(true, Some(_)) => return wrap_return(dcx, doctest::test_markdown(&input, options, dcx)),
|
||||
(true, None) => return doctest::run(dcx, input, options),
|
||||
(false, Some(md_input)) => {
|
||||
let md_input = md_input.to_owned();
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
use semver::Version;
|
||||
|
||||
use crate::edition::Edition;
|
||||
use crate::executor::ColorConfig;
|
||||
use crate::fatal;
|
||||
use crate::util::{Utf8PathBufExt, add_dylib_path, string_enum};
|
||||
|
||||
@@ -597,11 +596,6 @@ pub struct Config {
|
||||
/// FIXME: this is *way* too coarse; the user can't select *which* info to verbosely dump.
|
||||
pub verbose: bool,
|
||||
|
||||
/// Whether to use colors in test output.
|
||||
///
|
||||
/// Note: the exact control mechanism is delegated to [`colored`].
|
||||
pub color: ColorConfig,
|
||||
|
||||
/// Where to find the remote test client process, if we're using it.
|
||||
///
|
||||
/// Note: this is *only* used for target platform executables created by `run-make` test
|
||||
@@ -623,9 +617,6 @@ pub struct Config {
|
||||
/// created in `$test_suite_build_root/rustfix_missing_coverage.txt`
|
||||
pub rustfix_coverage: bool,
|
||||
|
||||
/// Whether to run `tidy` (html-tidy) when a rustdoc test fails.
|
||||
pub has_html_tidy: bool,
|
||||
|
||||
/// Whether to run `enzyme` autodiff tests.
|
||||
pub has_enzyme: bool,
|
||||
|
||||
|
||||
@@ -341,15 +341,6 @@ pub(crate) struct CollectedTestDesc {
|
||||
pub(crate) should_fail: ShouldFail,
|
||||
}
|
||||
|
||||
/// Whether console output should be colored or not.
|
||||
#[derive(Copy, Clone, Default, Debug)]
|
||||
pub enum ColorConfig {
|
||||
#[default]
|
||||
AutoColor,
|
||||
AlwaysColor,
|
||||
NeverColor,
|
||||
}
|
||||
|
||||
/// Tests with `//@ should-fail` are tests of compiletest itself, and should
|
||||
/// be reported as successful if and only if they would have _failed_.
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
use std::collections::HashSet;
|
||||
use std::fmt::Write;
|
||||
use std::io::{self, ErrorKind};
|
||||
use std::process::{Command, Stdio};
|
||||
use std::sync::{Arc, OnceLock};
|
||||
use std::time::SystemTime;
|
||||
use std::{env, fs, vec};
|
||||
@@ -43,7 +42,7 @@
|
||||
};
|
||||
use crate::directives::{AuxProps, DirectivesCache, FileDirectives};
|
||||
use crate::edition::parse_edition;
|
||||
use crate::executor::{CollectedTest, ColorConfig};
|
||||
use crate::executor::CollectedTest;
|
||||
|
||||
/// Creates the `Config` instance for this invocation of compiletest.
|
||||
///
|
||||
@@ -136,8 +135,9 @@ fn parse_config(args: Vec<String>) -> Config {
|
||||
"overwrite stderr/stdout files instead of complaining about a mismatch",
|
||||
)
|
||||
.optflag("", "fail-fast", "stop as soon as possible after any test fails")
|
||||
.optopt("", "color", "coloring: auto, always, never", "WHEN")
|
||||
.optopt("", "target", "the target to build for", "TARGET")
|
||||
// FIXME: Should be removed once `bootstrap` will be updated to not use this option.
|
||||
.optopt("", "color", "coloring: auto, always, never", "WHEN")
|
||||
.optopt("", "host", "the host to build for", "HOST")
|
||||
.optopt("", "cdb", "path to CDB to use for CDB debuginfo tests", "PATH")
|
||||
.optopt("", "gdb", "path to GDB to use for GDB debuginfo tests", "PATH")
|
||||
@@ -274,12 +274,6 @@ fn opt_path(m: &getopts::Matches, nm: &str) -> Utf8PathBuf {
|
||||
let lldb = matches.opt_str("lldb").map(Utf8PathBuf::from);
|
||||
let lldb_version =
|
||||
matches.opt_str("lldb-version").as_deref().and_then(debuggers::extract_lldb_version);
|
||||
let color = match matches.opt_str("color").as_deref() {
|
||||
Some("auto") | None => ColorConfig::AutoColor,
|
||||
Some("always") => ColorConfig::AlwaysColor,
|
||||
Some("never") => ColorConfig::NeverColor,
|
||||
Some(x) => panic!("argument for --color must be auto, always, or never, but found `{}`", x),
|
||||
};
|
||||
// FIXME: this is very questionable, we really should be obtaining LLVM version info from
|
||||
// `bootstrap`, and not trying to be figuring out that in `compiletest` by running the
|
||||
// `FileCheck` binary.
|
||||
@@ -304,16 +298,6 @@ fn opt_path(m: &getopts::Matches, nm: &str) -> Utf8PathBuf {
|
||||
let with_rustc_debug_assertions = matches.opt_present("with-rustc-debug-assertions");
|
||||
let with_std_debug_assertions = matches.opt_present("with-std-debug-assertions");
|
||||
let mode = matches.opt_str("mode").unwrap().parse().expect("invalid mode");
|
||||
let has_html_tidy = if mode == TestMode::Rustdoc {
|
||||
Command::new("tidy")
|
||||
.arg("--version")
|
||||
.stdout(Stdio::null())
|
||||
.status()
|
||||
.map_or(false, |status| status.success())
|
||||
} else {
|
||||
// Avoid spawning an external command when we know html-tidy won't be used.
|
||||
false
|
||||
};
|
||||
let has_enzyme = matches.opt_present("has-enzyme");
|
||||
let filters = if mode == TestMode::RunMake {
|
||||
matches
|
||||
@@ -455,11 +439,9 @@ fn opt_path(m: &getopts::Matches, nm: &str) -> Utf8PathBuf {
|
||||
adb_device_status,
|
||||
verbose: matches.opt_present("verbose"),
|
||||
only_modified: matches.opt_present("only-modified"),
|
||||
color,
|
||||
remote_test_client: matches.opt_str("remote-test-client").map(Utf8PathBuf::from),
|
||||
compare_mode,
|
||||
rustfix_coverage: matches.opt_present("rustfix-coverage"),
|
||||
has_html_tidy,
|
||||
has_enzyme,
|
||||
channel: matches.opt_str("channel").unwrap(),
|
||||
git_hash: matches.opt_present("git-hash"),
|
||||
@@ -1144,10 +1126,6 @@ fn check_for_overlapping_test_paths(found_path_stems: &HashSet<Utf8PathBuf>) {
|
||||
}
|
||||
|
||||
fn early_config_check(config: &Config) {
|
||||
if !config.has_html_tidy && config.mode == TestMode::Rustdoc {
|
||||
warning!("`tidy` (html-tidy.org) is not installed; diffs will not be generated");
|
||||
}
|
||||
|
||||
if !config.profiler_runtime && config.mode == TestMode::CoverageRun {
|
||||
let actioned = if config.bless { "blessed" } else { "checked" };
|
||||
warning!("profiler runtime is not available, so `.coverage` files won't be {actioned}");
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
use std::borrow::Cow;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::ffi::OsString;
|
||||
use std::fs::{self, File, create_dir_all};
|
||||
use std::fs::{self, create_dir_all};
|
||||
use std::hash::{DefaultHasher, Hash, Hasher};
|
||||
use std::io::prelude::*;
|
||||
use std::io::{self, BufReader};
|
||||
use std::process::{Child, Command, ExitStatus, Output, Stdio};
|
||||
use std::{env, fmt, iter, str};
|
||||
use std::{env, fmt, io, iter, str};
|
||||
|
||||
use build_helper::fs::remove_and_create_dir_all;
|
||||
use camino::{Utf8Path, Utf8PathBuf};
|
||||
@@ -23,9 +22,9 @@
|
||||
use crate::errors::{Error, ErrorKind, load_errors};
|
||||
use crate::output_capture::ConsoleOut;
|
||||
use crate::read2::{Truncated, read2_abbreviated};
|
||||
use crate::runtest::compute_diff::{DiffLine, make_diff, write_diff, write_filtered_diff};
|
||||
use crate::runtest::compute_diff::{DiffLine, make_diff, write_diff};
|
||||
use crate::util::{Utf8PathBufExt, add_dylib_path, static_regex};
|
||||
use crate::{ColorConfig, help, json, stamp_file_path, warning};
|
||||
use crate::{json, stamp_file_path};
|
||||
|
||||
// Helper modules that implement test running logic for each test suite.
|
||||
// tidy-alphabetical-start
|
||||
@@ -2165,161 +2164,6 @@ fn charset() -> &'static str {
|
||||
if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
|
||||
}
|
||||
|
||||
fn compare_to_default_rustdoc(&self, out_dir: &Utf8Path) {
|
||||
if !self.config.has_html_tidy {
|
||||
return;
|
||||
}
|
||||
writeln!(self.stdout, "info: generating a diff against nightly rustdoc");
|
||||
|
||||
let suffix =
|
||||
self.safe_revision().map_or("nightly".into(), |path| path.to_owned() + "-nightly");
|
||||
let compare_dir = output_base_dir(self.config, self.testpaths, Some(&suffix));
|
||||
remove_and_create_dir_all(&compare_dir).unwrap_or_else(|e| {
|
||||
panic!("failed to remove and recreate output directory `{compare_dir}`: {e}")
|
||||
});
|
||||
|
||||
// We need to create a new struct for the lifetimes on `config` to work.
|
||||
let new_rustdoc = TestCx {
|
||||
config: &Config {
|
||||
// FIXME: use beta or a user-specified rustdoc instead of
|
||||
// hardcoding the default toolchain
|
||||
rustdoc_path: Some("rustdoc".into()),
|
||||
// Needed for building auxiliary docs below
|
||||
rustc_path: "rustc".into(),
|
||||
..self.config.clone()
|
||||
},
|
||||
..*self
|
||||
};
|
||||
|
||||
let output_file = TargetLocation::ThisDirectory(new_rustdoc.aux_output_dir_name());
|
||||
let mut rustc = new_rustdoc.make_compile_args(
|
||||
&new_rustdoc.testpaths.file,
|
||||
output_file,
|
||||
Emit::None,
|
||||
AllowUnused::Yes,
|
||||
LinkToAux::Yes,
|
||||
Vec::new(),
|
||||
);
|
||||
let aux_dir = new_rustdoc.aux_output_dir();
|
||||
new_rustdoc.build_all_auxiliary(&aux_dir, &mut rustc);
|
||||
|
||||
let proc_res = new_rustdoc.document(&compare_dir, DocKind::Html);
|
||||
if !proc_res.status.success() {
|
||||
writeln!(self.stderr, "failed to run nightly rustdoc");
|
||||
return;
|
||||
}
|
||||
|
||||
#[rustfmt::skip]
|
||||
let tidy_args = [
|
||||
"--new-blocklevel-tags", "rustdoc-search,rustdoc-toolbar,rustdoc-topbar",
|
||||
"--indent", "yes",
|
||||
"--indent-spaces", "2",
|
||||
"--wrap", "0",
|
||||
"--show-warnings", "no",
|
||||
"--markup", "yes",
|
||||
"--quiet", "yes",
|
||||
"-modify",
|
||||
];
|
||||
let tidy_dir = |dir| {
|
||||
for entry in walkdir::WalkDir::new(dir) {
|
||||
let entry = entry.expect("failed to read file");
|
||||
if entry.file_type().is_file()
|
||||
&& entry.path().extension().and_then(|p| p.to_str()) == Some("html")
|
||||
{
|
||||
let status =
|
||||
Command::new("tidy").args(&tidy_args).arg(entry.path()).status().unwrap();
|
||||
// `tidy` returns 1 if it modified the file.
|
||||
assert!(status.success() || status.code() == Some(1));
|
||||
}
|
||||
}
|
||||
};
|
||||
tidy_dir(out_dir);
|
||||
tidy_dir(&compare_dir);
|
||||
|
||||
let pager = {
|
||||
let output = Command::new("git").args(&["config", "--get", "core.pager"]).output().ok();
|
||||
output.and_then(|out| {
|
||||
if out.status.success() {
|
||||
Some(String::from_utf8(out.stdout).expect("invalid UTF8 in git pager"))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
};
|
||||
|
||||
let diff_filename = format!("build/tmp/rustdoc-compare-{}.diff", std::process::id());
|
||||
|
||||
if !write_filtered_diff(
|
||||
self,
|
||||
&diff_filename,
|
||||
out_dir,
|
||||
&compare_dir,
|
||||
self.config.verbose,
|
||||
|file_type, extension| {
|
||||
file_type.is_file() && (extension == Some("html") || extension == Some("js"))
|
||||
},
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
match self.config.color {
|
||||
ColorConfig::AlwaysColor => colored::control::set_override(true),
|
||||
ColorConfig::NeverColor => colored::control::set_override(false),
|
||||
_ => {}
|
||||
}
|
||||
|
||||
if let Some(pager) = pager {
|
||||
let pager = pager.trim();
|
||||
if self.config.verbose {
|
||||
writeln!(self.stderr, "using pager {}", pager);
|
||||
}
|
||||
let output = Command::new(pager)
|
||||
// disable paging; we want this to be non-interactive
|
||||
.env("PAGER", "")
|
||||
.stdin(File::open(&diff_filename).unwrap())
|
||||
// Capture output and print it explicitly so it will in turn be
|
||||
// captured by output-capture.
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(output.status.success());
|
||||
writeln!(self.stdout, "{}", String::from_utf8_lossy(&output.stdout));
|
||||
writeln!(self.stderr, "{}", String::from_utf8_lossy(&output.stderr));
|
||||
} else {
|
||||
warning!("no pager configured, falling back to unified diff");
|
||||
help!(
|
||||
"try configuring a git pager (e.g. `delta`) with \
|
||||
`git config --global core.pager delta`"
|
||||
);
|
||||
let mut out = io::stdout();
|
||||
let mut diff = BufReader::new(File::open(&diff_filename).unwrap());
|
||||
let mut line = Vec::new();
|
||||
loop {
|
||||
line.truncate(0);
|
||||
match diff.read_until(b'\n', &mut line) {
|
||||
Ok(0) => break,
|
||||
Ok(_) => {}
|
||||
Err(e) => writeln!(self.stderr, "ERROR: {:?}", e),
|
||||
}
|
||||
match String::from_utf8(line.clone()) {
|
||||
Ok(line) => {
|
||||
if line.starts_with('+') {
|
||||
write!(&mut out, "{}", line.green()).unwrap();
|
||||
} else if line.starts_with('-') {
|
||||
write!(&mut out, "{}", line.red()).unwrap();
|
||||
} else if line.starts_with('@') {
|
||||
write!(&mut out, "{}", line.blue()).unwrap();
|
||||
} else {
|
||||
out.write_all(line.as_bytes()).unwrap();
|
||||
}
|
||||
}
|
||||
Err(_) => {
|
||||
write!(&mut out, "{}", String::from_utf8_lossy(&line).reversed()).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
fn get_lines(&self, path: &Utf8Path, mut other_files: Option<&mut Vec<String>>) -> Vec<usize> {
|
||||
let content = fs::read_to_string(path.as_std_path()).unwrap();
|
||||
let mut ignore = false;
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
use std::collections::VecDeque;
|
||||
use std::fs::{File, FileType};
|
||||
|
||||
use camino::Utf8Path;
|
||||
|
||||
use crate::runtest::TestCx;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum DiffLine {
|
||||
@@ -109,55 +104,3 @@ pub(crate) fn write_diff(expected: &str, actual: &str, context_size: usize) -> S
|
||||
}
|
||||
output
|
||||
}
|
||||
|
||||
/// Filters based on filetype and extension whether to diff a file.
|
||||
///
|
||||
/// Returns whether any data was actually written.
|
||||
pub(crate) fn write_filtered_diff<Filter>(
|
||||
cx: &TestCx<'_>,
|
||||
diff_filename: &str,
|
||||
out_dir: &Utf8Path,
|
||||
compare_dir: &Utf8Path,
|
||||
verbose: bool,
|
||||
filter: Filter,
|
||||
) -> bool
|
||||
where
|
||||
Filter: Fn(FileType, Option<&str>) -> bool,
|
||||
{
|
||||
use std::io::{Read, Write};
|
||||
let mut diff_output = File::create(diff_filename).unwrap();
|
||||
let mut wrote_data = false;
|
||||
for entry in walkdir::WalkDir::new(out_dir.as_std_path()) {
|
||||
let entry = entry.expect("failed to read file");
|
||||
let extension = entry.path().extension().and_then(|p| p.to_str());
|
||||
if filter(entry.file_type(), extension) {
|
||||
let expected_path = compare_dir
|
||||
.as_std_path()
|
||||
.join(entry.path().strip_prefix(&out_dir.as_std_path()).unwrap());
|
||||
let expected = if let Ok(s) = std::fs::read(&expected_path) { s } else { continue };
|
||||
let actual_path = entry.path();
|
||||
let actual = std::fs::read(&actual_path).unwrap();
|
||||
let diff = unified_diff::diff(
|
||||
&expected,
|
||||
&expected_path.to_str().unwrap(),
|
||||
&actual,
|
||||
&actual_path.to_str().unwrap(),
|
||||
3,
|
||||
);
|
||||
wrote_data |= !diff.is_empty();
|
||||
diff_output.write_all(&diff).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
if !wrote_data {
|
||||
writeln!(cx.stdout, "note: diff is identical to nightly rustdoc");
|
||||
assert!(diff_output.metadata().unwrap().len() == 0);
|
||||
return false;
|
||||
} else if verbose {
|
||||
writeln!(cx.stderr, "printing diff:");
|
||||
let mut buf = Vec::new();
|
||||
diff_output.read_to_end(&mut buf).unwrap();
|
||||
std::io::stderr().lock().write_all(&mut buf).unwrap();
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
@@ -28,9 +28,7 @@ pub(super) fn run_rustdoc_test(&self) {
|
||||
}
|
||||
let res = self.run_command_to_procres(&mut cmd);
|
||||
if !res.status.success() {
|
||||
self.fatal_proc_rec_general("htmldocck failed!", None, &res, || {
|
||||
self.compare_to_default_rustdoc(&out_dir);
|
||||
});
|
||||
self.fatal_proc_rec("htmldocck failed!", &res);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,11 +108,9 @@ fn incomplete_config_for_rustdoc_gui_test() -> Config {
|
||||
adb_test_dir: Default::default(),
|
||||
adb_device_status: Default::default(),
|
||||
verbose: Default::default(),
|
||||
color: Default::default(),
|
||||
remote_test_client: Default::default(),
|
||||
compare_mode: Default::default(),
|
||||
rustfix_coverage: Default::default(),
|
||||
has_html_tidy: Default::default(),
|
||||
has_enzyme: Default::default(),
|
||||
channel: Default::default(),
|
||||
git_hash: Default::default(),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//@error-in-other-file: aborted execution
|
||||
// Backtraces vary wildly between platforms, we have to normalize away almost the entire thing
|
||||
//@normalize-stderr-test: "'main'|'<unnamed>'" -> "$$NAME"
|
||||
//@normalize-stderr-test: ".*(note|-->|\|).*\n" -> ""
|
||||
//@normalize-stderr-test: ".*(note|-->|:::|\|).*\n" -> ""
|
||||
|
||||
pub struct NoisyDrop {}
|
||||
|
||||
|
||||
@@ -91,20 +91,16 @@ fn extract_error_codes(root_path: &Path, check: &mut RunningCheck) -> Vec<String
|
||||
let line_index = line_index + 1;
|
||||
let line = line.trim();
|
||||
|
||||
if line.starts_with('E') {
|
||||
let split_line = line.split_once(':');
|
||||
|
||||
// Extract the error code from the line. Emit a fatal error if it is not in the correct
|
||||
// format.
|
||||
let Some(split_line) = split_line else {
|
||||
if line.starts_with(|c: char| c.is_ascii_digit()) {
|
||||
let mut chars = line.chars();
|
||||
let err_code = chars.by_ref().take(4).collect::<String>();
|
||||
if chars.next() != Some(',') {
|
||||
check.error(format!(
|
||||
"{path}:{line_index}: Expected a line with the format `Eabcd: abcd, \
|
||||
but got \"{line}\" without a `:` delimiter",
|
||||
"{path}:{line_index}: Expected a line with the format `abcd,` \
|
||||
but got \"{line}\" without a `,` delimiter",
|
||||
));
|
||||
continue;
|
||||
};
|
||||
|
||||
let err_code = split_line.0.to_owned();
|
||||
}
|
||||
|
||||
// If this is a duplicate of another error code, emit a fatal error.
|
||||
if error_codes.contains(&err_code) {
|
||||
@@ -114,35 +110,13 @@ fn extract_error_codes(root_path: &Path, check: &mut RunningCheck) -> Vec<String
|
||||
continue;
|
||||
}
|
||||
|
||||
let mut chars = err_code.chars();
|
||||
assert_eq!(chars.next(), Some('E'));
|
||||
let error_num_as_str = chars.as_str();
|
||||
|
||||
// Ensure that the line references the correct markdown file.
|
||||
let rest = split_line.1.split_once(',');
|
||||
let Some(rest) = rest else {
|
||||
check.error(format!(
|
||||
"{path}:{line_index}: Expected a line with the format `Eabcd: abcd, \
|
||||
but got \"{line}\" without a `,` delimiter",
|
||||
));
|
||||
continue;
|
||||
};
|
||||
if error_num_as_str != rest.0.trim() {
|
||||
check.error(format!(
|
||||
"{path}:{line_index}: `{}:` should be followed by `{},` but instead found `{}` in \
|
||||
`compiler/rustc_error_codes/src/lib.rs`",
|
||||
err_code,
|
||||
error_num_as_str,
|
||||
split_line.1,
|
||||
));
|
||||
continue;
|
||||
}
|
||||
if !rest.1.trim().is_empty() && !rest.1.trim().starts_with("//") {
|
||||
let rest = chars.as_str().trim();
|
||||
if !rest.is_empty() && !rest.starts_with("//") {
|
||||
check.error(format!("{path}:{line_index}: should only have one error per line"));
|
||||
continue;
|
||||
}
|
||||
|
||||
error_codes.push(err_code);
|
||||
error_codes.push(format!("E{err_code}"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1583,7 +1583,6 @@ ui/macros/issue-6596-1.rs
|
||||
ui/macros/issue-6596-2.rs
|
||||
ui/macros/issue-68058.rs
|
||||
ui/macros/issue-68060.rs
|
||||
ui/macros/issue-69396-const-no-type-in-macro.rs
|
||||
ui/macros/issue-69838-mods-relative-to-included-path.rs
|
||||
ui/macros/issue-70446.rs
|
||||
ui/macros/issue-75982-foreign-macro-weird-mod.rs
|
||||
@@ -2100,7 +2099,6 @@ ui/parser/issues/issue-88770.rs
|
||||
ui/parser/issues/issue-88818.rs
|
||||
ui/parser/issues/issue-89388.rs
|
||||
ui/parser/issues/issue-89396.rs
|
||||
ui/parser/issues/issue-89574.rs
|
||||
ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
|
||||
ui/parser/issues/issue-90728.rs
|
||||
ui/parser/issues/issue-90993.rs
|
||||
@@ -2880,7 +2878,6 @@ ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs
|
||||
ui/typeck/auxiliary/issue-29181.rs
|
||||
ui/typeck/auxiliary/issue-36708.rs
|
||||
ui/typeck/auxiliary/issue-81943-lib.rs
|
||||
ui/typeck/issue-100164.rs
|
||||
ui/typeck/issue-100246.rs
|
||||
ui/typeck/issue-100285.rs
|
||||
ui/typeck/issue-103899.rs
|
||||
@@ -2937,7 +2934,6 @@ ui/typeck/issue-74933.rs
|
||||
ui/typeck/issue-75883.rs
|
||||
ui/typeck/issue-75889.rs
|
||||
ui/typeck/issue-7813.rs
|
||||
ui/typeck/issue-79040.rs
|
||||
ui/typeck/issue-80207-unsized-return.rs
|
||||
ui/typeck/issue-80779.rs
|
||||
ui/typeck/issue-81293.rs
|
||||
|
||||
@@ -154,6 +154,10 @@ Options:
|
||||
Comma separated list of types of output for rustdoc to
|
||||
emit
|
||||
--no-run Compile doctests without running them
|
||||
--merge-doctests yes|no|auto
|
||||
Force all doctests to be compiled as a single binary,
|
||||
instead of one binary per test. If merging fails,
|
||||
rustdoc will emit a hard error.
|
||||
--remap-path-prefix FROM=TO
|
||||
Remap source names in compiler messages
|
||||
--show-type-layout
|
||||
|
||||
@@ -1,19 +1,46 @@
|
||||
// The goal of this test is to check that the external trait implementors, generated with JS,
|
||||
// have the same display than the "local" ones.
|
||||
go-to: "file://" + |DOC_PATH| + "/implementors/trait.Whatever.html"
|
||||
assert: "#implementors-list"
|
||||
// There are supposed to be two implementors listed.
|
||||
assert-count: ("#implementors-list .impl", 2)
|
||||
wait-for-css: ("#implementors-list", {"display": "block"})
|
||||
// There are supposed to be four implementors listed.
|
||||
assert-count: ("#implementors-list .impl", 4)
|
||||
// There are supposed to be two non-negative implementors.
|
||||
assert-count: ("#implementors-list .negative-marker ~ *", 2)
|
||||
// Now we check that both implementors have an anchor, an ID and a similar DOM.
|
||||
assert: ("#implementors-list .impl:nth-child(1) > a.anchor")
|
||||
assert-attribute: ("#implementors-list .impl:nth-child(1)", {"id": "impl-Whatever-for-Struct"})
|
||||
assert-attribute: ("#implementors-list .impl:nth-child(1) > a.anchor", {"href": "#impl-Whatever-for-Struct"})
|
||||
assert: "#implementors-list .impl:nth-child(1) > .code-header"
|
||||
define-function: (
|
||||
"check-dom",
|
||||
[id],
|
||||
block {
|
||||
assert-attribute: (|id| + " > a.anchor", {"href": |id|})
|
||||
assert: |id| + " > .code-header"
|
||||
},
|
||||
)
|
||||
|
||||
assert: ("#implementors-list .impl:nth-child(2) > a.anchor")
|
||||
assert-attribute: ("#implementors-list .impl:nth-child(2)", {"id": "impl-Whatever-1"})
|
||||
assert-attribute: ("#implementors-list .impl:nth-child(2) > a.anchor", {"href": "#impl-Whatever-1"})
|
||||
assert: "#implementors-list .impl:nth-child(2) > .code-header"
|
||||
call-function: ("check-dom", {"id": "#impl-Whatever-for-Struct2"})
|
||||
call-function: ("check-dom", {"id": "#impl-Whatever-2"})
|
||||
call-function: ("check-dom", {"id": "#impl-Whatever-for-Struct"})
|
||||
call-function: ("check-dom", {"id": "#impl-Whatever-3"})
|
||||
|
||||
// Ensure that negative impl are sorted first.
|
||||
assert-property: (
|
||||
"#implementors-list > *:nth-child(1) > h3",
|
||||
{"textContent": "impl !Whatever for Struct2"},
|
||||
)
|
||||
assert-property: (
|
||||
"#implementors-list > *:nth-child(2) > h3",
|
||||
{"textContent": "impl !Whatever for StructToImplOnReexport"},
|
||||
)
|
||||
// Third one is the negative marker.
|
||||
assert-attribute: ("#implementors-list > *:nth-child(3)", {"class": "negative-marker"})
|
||||
// This one is a `<detail>` so the selector is a bit different.
|
||||
assert-property: (
|
||||
"#implementors-list > *:nth-child(4) section > h3",
|
||||
{"textContent": "impl Whatever for Struct"},
|
||||
)
|
||||
assert-property: (
|
||||
"#implementors-list > *:nth-child(5) > h3",
|
||||
{"textContent": "impl Whatever for Foo"},
|
||||
)
|
||||
|
||||
go-to: "file://" + |DOC_PATH| + "/test_docs/struct.HasEmptyTraits.html"
|
||||
compare-elements-position-near-false: (
|
||||
@@ -39,3 +66,8 @@ assert-count: ("#implementors-list .impl", 1)
|
||||
go-to: "file://" + |DOC_PATH| + "/http/trait.HttpTrait.html"
|
||||
assert-count: ("#implementors-list .impl", 1)
|
||||
assert-attribute: ("#implementors-list .impl a.trait", {"href": "../http/trait.HttpTrait.html"})
|
||||
|
||||
// Now we check that if JS is disabled, the implementors list will be visible.
|
||||
javascript: false
|
||||
reload:
|
||||
assert-css: ("#implementors-list", {"display": "block"})
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
#![feature(negative_impls)]
|
||||
|
||||
pub trait Whatever {
|
||||
type Foo;
|
||||
|
||||
@@ -5,11 +7,14 @@ fn method() {}
|
||||
}
|
||||
|
||||
pub struct Struct;
|
||||
pub struct Struct2;
|
||||
|
||||
impl Whatever for Struct {
|
||||
type Foo = u8;
|
||||
}
|
||||
|
||||
impl !Whatever for Struct2 {}
|
||||
|
||||
impl http::HttpTrait for Struct {}
|
||||
|
||||
mod traits {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// ignore-tidy-linelength
|
||||
|
||||
#![feature(doc_cfg)]
|
||||
#![feature(negative_impls)]
|
||||
|
||||
pub mod another_folder;
|
||||
pub mod another_mod;
|
||||
@@ -60,6 +61,8 @@ impl implementors::Whatever for Foo {
|
||||
type Foo = u32;
|
||||
}
|
||||
|
||||
impl !implementors::Whatever for StructToImplOnReexport {}
|
||||
|
||||
#[doc(inline)]
|
||||
pub use implementors::TraitToReexport;
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
//@ check-pass
|
||||
//@ edition: 2024
|
||||
//@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=yes -Z unstable-options
|
||||
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
|
||||
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
|
||||
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
|
||||
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
|
||||
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
|
||||
|
||||
// FIXME: compiletest doesn't support `// RAW` for doctests because the progress messages aren't
|
||||
// emitted as JSON. Instead the .stderr file tests that this doesn't contains a
|
||||
// "merged compilation took ..." message.
|
||||
|
||||
/// ```standalone_crate
|
||||
/// let x = 12;
|
||||
/// ```
|
||||
///
|
||||
/// These two doctests should be not be merged, even though this passes `--merge-doctests=yes`.
|
||||
///
|
||||
/// ```standalone_crate
|
||||
/// fn main() {
|
||||
/// println!("owo");
|
||||
/// }
|
||||
/// ```
|
||||
pub struct Foo;
|
||||
@@ -0,0 +1,7 @@
|
||||
|
||||
running 2 tests
|
||||
test $DIR/force-merge-default-not-override.rs - Foo (line 14) ... ok
|
||||
test $DIR/force-merge-default-not-override.rs - Foo (line 20) ... ok
|
||||
|
||||
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
//@ edition: 2018
|
||||
//@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=yes -Z unstable-options
|
||||
//@ normalize-stderr: ".*doctest_bundle_2018.rs:\d+:\d+" -> "doctest_bundle_2018.rs:$$LINE:$$COL"
|
||||
|
||||
//~? ERROR failed to merge doctests
|
||||
|
||||
/// These two doctests will fail to force-merge, and should give a hard error as a result.
|
||||
///
|
||||
/// ```
|
||||
/// #![deny(clashing_extern_declarations)]
|
||||
/// unsafe extern "C" { fn unmangled_name() -> u8; }
|
||||
/// ```
|
||||
///
|
||||
/// ```
|
||||
/// #![deny(clashing_extern_declarations)]
|
||||
/// unsafe extern "C" { fn unmangled_name(); }
|
||||
/// ```
|
||||
pub struct Foo;
|
||||
@@ -0,0 +1,6 @@
|
||||
doctest_bundle_2018.rs:$LINE:$COL: error: `unmangled_name` redeclared with a different signature: this signature doesn't match the previous declaration
|
||||
error: aborting due to 1 previous error
|
||||
error: failed to merge doctests
|
||||
|
|
||||
= note: requested explicitly on the command line with `--merge-doctests=yes`
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
//@ check-pass
|
||||
//@ edition: 2018
|
||||
//@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=yes -Z unstable-options
|
||||
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
|
||||
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
|
||||
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
|
||||
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
|
||||
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
|
||||
|
||||
// FIXME: compiletest doesn't support `// RAW` for doctests because the progress messages aren't
|
||||
// emitted as JSON. Instead the .stderr file tests that this contains a
|
||||
// "merged compilation took ..." message.
|
||||
|
||||
/// ```
|
||||
/// let x = 12;
|
||||
/// ```
|
||||
///
|
||||
/// These two doctests should be force-merged, even though this uses edition 2018.
|
||||
///
|
||||
/// ```
|
||||
/// fn main() {
|
||||
/// println!("owo");
|
||||
/// }
|
||||
/// ```
|
||||
pub struct Foo;
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
running 2 tests
|
||||
test $DIR/force-merge.rs - Foo (line 14) ... ok
|
||||
test $DIR/force-merge.rs - Foo (line 20) ... ok
|
||||
|
||||
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
|
||||
|
||||
all doctests ran in $TIME; merged doctests compilation took $TIME
|
||||
@@ -0,0 +1,24 @@
|
||||
//@ edition: 2024
|
||||
//@ check-pass
|
||||
//@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=no -Z unstable-options
|
||||
//@ normalize-stderr: ".*doctest_bundle_2018.rs:\d+:\d+" -> "doctest_bundle_2018.rs:$$LINE:$$COL"
|
||||
|
||||
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
|
||||
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
|
||||
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
|
||||
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
|
||||
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
|
||||
|
||||
/// These two doctests should not force-merge, even though this crate has edition 2024 and the
|
||||
/// individual doctests are not annotated.
|
||||
///
|
||||
/// ```
|
||||
/// #![deny(clashing_extern_declarations)]
|
||||
/// unsafe extern "C" { fn unmangled_name() -> u8; }
|
||||
/// ```
|
||||
///
|
||||
/// ```
|
||||
/// #![deny(clashing_extern_declarations)]
|
||||
/// unsafe extern "C" { fn unmangled_name(); }
|
||||
/// ```
|
||||
pub struct Foo;
|
||||
@@ -0,0 +1,7 @@
|
||||
|
||||
running 2 tests
|
||||
test $DIR/force-no-merge.rs - Foo (line 15) ... ok
|
||||
test $DIR/force-no-merge.rs - Foo (line 20) ... ok
|
||||
|
||||
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
//! `--merge-doctests=auto` should override the edition.
|
||||
|
||||
//@ check-pass
|
||||
//@ edition: 2018
|
||||
//@ compile-flags: --test --test-args=--test-threads=1 --merge-doctests=auto -Z unstable-options
|
||||
|
||||
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
|
||||
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
|
||||
//@ normalize-stdout: "ran in \d+\.\d+s" -> "ran in $$TIME"
|
||||
//@ normalize-stdout: "compilation took \d+\.\d+s" -> "compilation took $$TIME"
|
||||
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
|
||||
|
||||
// FIXME: compiletest doesn't support `// RAW` for doctests because the progress messages aren't
|
||||
// emitted as JSON. Instead the .stderr file tests that this contains a
|
||||
// "merged compilation took ..." message.
|
||||
|
||||
/// ```
|
||||
/// let x = 12;
|
||||
/// ```
|
||||
///
|
||||
/// These two doctests should be auto-merged, even though this uses edition 2018.
|
||||
///
|
||||
/// ```
|
||||
/// fn main() {
|
||||
/// println!("owo");
|
||||
/// }
|
||||
/// ```
|
||||
pub struct Foo;
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
running 2 tests
|
||||
test $DIR/merge-doctests-auto.rs - Foo (line 17) ... ok
|
||||
test $DIR/merge-doctests-auto.rs - Foo (line 23) ... ok
|
||||
|
||||
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
|
||||
|
||||
all doctests ran in $TIME; merged doctests compilation took $TIME
|
||||
@@ -0,0 +1,2 @@
|
||||
//@ compile-flags: --merge-doctests=bad-opt -Zunstable-options
|
||||
//~? ERROR must be a boolean
|
||||
@@ -0,0 +1,2 @@
|
||||
error: argument to --merge-doctests must be a boolean (true/false) or 'auto'
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
//@ compile-flags: --merge-doctests=no
|
||||
//~? RAW `-Z unstable-options` flag must also be passed
|
||||
@@ -0,0 +1,2 @@
|
||||
error: the `-Z unstable-options` flag must also be passed to enable the flag `merge-doctests`
|
||||
|
||||
@@ -18,6 +18,9 @@ help: the following other types implement trait `VisitorResult`
|
||||
= note: `ControlFlow<T>`
|
||||
note: required by a bound in `rustc_ast::visit::Visitor::Result`
|
||||
--> /rustc-dev/xyz/compiler/rustc_ast/src/visit.rs:LL:COL
|
||||
::: /rustc-dev/xyz/compiler/rustc_ast/src/visit.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
= note: this error originates in the macro `common_visitor_and_walkers` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
@@ -20,8 +20,11 @@ LL | impl<T> VisitorResult for ControlFlow<T> {
|
||||
note: required by a bound in `rustc_ast::visit::Visitor::Result`
|
||||
--> $COMPILER_DIR_REAL/rustc_ast/src/visit.rs:LL:COL
|
||||
|
|
||||
LL | type Result: VisitorResult = ();
|
||||
| ^^^^^^^^^^^^^ required by this bound in `Visitor::Result`
|
||||
...
|
||||
LL | common_visitor_and_walkers!(Visitor<'a>);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Visitor::Result`
|
||||
| ---------------------------------------- in this macro invocation
|
||||
= note: this error originates in the macro `common_visitor_and_walkers` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
@@ -15,6 +15,9 @@ LL | struct NotIntoDiagArg;
|
||||
= help: normalized in stderr
|
||||
note: required by a bound in `Diag::<'a, G>::arg`
|
||||
--> $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
|
||||
::: $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
|
||||
|
|
||||
= note: in this macro invocation
|
||||
= note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: the trait bound `NotIntoDiagArg: IntoDiagArg` is not satisfied
|
||||
@@ -34,6 +37,9 @@ LL | struct NotIntoDiagArg;
|
||||
= help: normalized in stderr
|
||||
note: required by a bound in `Diag::<'a, G>::arg`
|
||||
--> $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
|
||||
::: $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
|
||||
|
|
||||
= note: in this macro invocation
|
||||
= note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
@@ -665,6 +665,9 @@ LL | struct Hello {}
|
||||
= help: normalized in stderr
|
||||
note: required by a bound in `Diag::<'a, G>::arg`
|
||||
--> $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
|
||||
::: $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
|
||||
|
|
||||
= note: in this macro invocation
|
||||
= note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 85 previous errors
|
||||
|
||||
@@ -305,13 +305,19 @@ LL | let _ = FOO & (*"Sized".to_string().into_boxed_str());
|
||||
help: the following other types implement trait `BitAnd<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/bit.rs:LL:COL
|
||||
|
|
||||
= note: `&i32` implements `BitAnd<i32>`
|
||||
= note: `i32` implements `BitAnd`
|
||||
::: $SRC_DIR/core/src/ops/bit.rs:LL:COL
|
||||
|
|
||||
= note: `&i32` implements `BitAnd`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&i32` implements `BitAnd<i32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `BitAnd<&i32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `BitAnd`
|
||||
= note: `&i32` implements `BitAnd`
|
||||
= note: this error originates in the macro `bitand_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: the size for values of type `str` cannot be known at compilation time
|
||||
|
||||
@@ -8,13 +8,19 @@ LL | x * y
|
||||
help: the following other types implement trait `Mul<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&i32` implements `Mul<i32>`
|
||||
= note: `i32` implements `Mul`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&i32` implements `Mul`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&i32` implements `Mul<i32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Mul<&i32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Mul`
|
||||
= note: `&i32` implements `Mul`
|
||||
= note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
@@ -84,6 +84,9 @@ LL | check(&mut () as *mut ());
|
||||
|
|
||||
help: the trait `ConstParamTy_` is implemented for `()`
|
||||
--> $SRC_DIR/core/src/marker.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/marker.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: required by a bound in `check`
|
||||
--> $DIR/const_param_ty_bad.rs:4:18
|
||||
|
|
||||
@@ -101,6 +104,9 @@ LL | check(&() as *const ());
|
||||
|
|
||||
help: the trait `ConstParamTy_` is implemented for `()`
|
||||
--> $SRC_DIR/core/src/marker.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/marker.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: required by a bound in `check`
|
||||
--> $DIR/const_param_ty_bad.rs:4:18
|
||||
|
|
||||
|
||||
@@ -14,13 +14,19 @@ LL | = [0; (i8::MAX + 1u8) as usize];
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&i8` implements `Add<i8>`
|
||||
= note: `i8` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&i8` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&i8` implements `Add<i8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i8` implements `Add<&i8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i8` implements `Add`
|
||||
= note: `&i8` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
@@ -14,13 +14,19 @@ LL | : [u32; (i8::MAX as i8 + 1u8) as usize]
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&i8` implements `Add<i8>`
|
||||
= note: `i8` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&i8` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&i8` implements `Add<i8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i8` implements `Add<&i8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `i8` implements `Add`
|
||||
= note: `&i8` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0604]: only `u8` can be cast as `char`, not `i8`
|
||||
|
||||
@@ -5,10 +5,13 @@ LL | let _ = 1 / ((IMM >= MIN && IMM <= MAX) as usize);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `post_monomorphization_error::ValidateConstImm::<2, 0, 1>::VALID` failed here
|
||||
|
||||
note: erroneous constant encountered
|
||||
--> $DIR/auxiliary/post_monomorphization_error.rs:19:5
|
||||
--> $DIR/auxiliary/post_monomorphization_error.rs:13:17
|
||||
|
|
||||
LL | let _ = $crate::ValidateConstImm::<$imm, 0, { (1 << 1) - 1 }>::VALID;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
...
|
||||
LL | static_assert_imm1!(IMM1);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ------------------------- in this macro invocation
|
||||
|
|
||||
= note: this note originates in the macro `static_assert_imm1` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
|
||||
@@ -6,8 +6,14 @@ LL | const _TOO_LOW: () = { u64::from_str_radix("12345ABCD", 1); };
|
||||
|
|
||||
note: inside `core::num::<impl u64>::from_str_radix`
|
||||
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `core::num::<impl u64>::from_ascii_radix`
|
||||
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
= note: this error originates in the macro `from_str_int_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0080]: evaluation panicked: from_ascii_radix: radix must lie in the range `[2, 36]`
|
||||
@@ -18,8 +24,14 @@ LL | const _TOO_HIGH: () = { u64::from_str_radix("12345ABCD", 37); };
|
||||
|
|
||||
note: inside `core::num::<impl u64>::from_str_radix`
|
||||
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `core::num::<impl u64>::from_ascii_radix`
|
||||
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
= note: this error originates in the macro `from_str_int_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
error[E0369]: cannot add `{integer}` to `&str`
|
||||
--> $DIR/issue-79040.rs:2:25
|
||||
--> $DIR/dont-suggest-type-error.rs:2:25
|
||||
|
|
||||
LL | const FOO = "hello" + 1;
|
||||
| ------- ^ - {integer}
|
||||
@@ -7,7 +7,7 @@ LL | const FOO = "hello" + 1;
|
||||
| &str
|
||||
|
||||
error: missing type for `const` item
|
||||
--> $DIR/issue-79040.rs:2:14
|
||||
--> $DIR/dont-suggest-type-error.rs:2:14
|
||||
|
|
||||
LL | const FOO = "hello" + 1;
|
||||
| ^
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
error[E0282]: type annotations needed
|
||||
--> $DIR/issue-89574.rs:2:25
|
||||
--> $DIR/empty-array.rs:2:25
|
||||
|
|
||||
LL | const EMPTY_ARRAY = [];
|
||||
| ^^ cannot infer type
|
||||
|
||||
error: missing type for `const` item
|
||||
--> $DIR/issue-89574.rs:2:22
|
||||
--> $DIR/empty-array.rs:2:22
|
||||
|
|
||||
LL | const EMPTY_ARRAY = [];
|
||||
| ^
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
error[E0428]: the name `A` is defined multiple times
|
||||
--> $DIR/issue-69396-const-no-type-in-macro.rs:4:13
|
||||
--> $DIR/in-macro.rs:4:13
|
||||
|
|
||||
LL | const A = "A".$fn();
|
||||
| ^^^^^^^^^^^^^^^^^^^^ `A` redefined here
|
||||
@@ -14,7 +14,7 @@ LL | | }
|
||||
= note: this error originates in the macro `suite` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: missing type for `const` item
|
||||
--> $DIR/issue-69396-const-no-type-in-macro.rs:4:20
|
||||
--> $DIR/in-macro.rs:4:20
|
||||
|
|
||||
LL | const A = "A".$fn();
|
||||
| ^ help: provide a type for the constant: `: usize`
|
||||
@@ -28,7 +28,7 @@ LL | | }
|
||||
= note: this error originates in the macro `suite` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0121]: missing type for item
|
||||
--> $DIR/issue-69396-const-no-type-in-macro.rs:4:20
|
||||
--> $DIR/in-macro.rs:4:20
|
||||
|
|
||||
LL | const A = "A".$fn();
|
||||
| ^ not allowed in type signatures
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
error: missing type for `const` item
|
||||
--> $DIR/issue-100164.rs:3:10
|
||||
--> $DIR/with-colon.rs:3:10
|
||||
|
|
||||
LL | const _A: = 123;
|
||||
| ^ help: provide a type for the constant: `i32`
|
||||
|
||||
error: missing type for `const` item
|
||||
--> $DIR/issue-100164.rs:7:14
|
||||
--> $DIR/with-colon.rs:7:14
|
||||
|
|
||||
LL | const _B: = 123;
|
||||
| ^ help: provide a type for the constant: `i32`
|
||||
@@ -5,9 +5,16 @@ LL | assert!(!ptr.wrapping_sub(512).is_null());
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `MAYBE_NULL` failed inside this call
|
||||
|
|
||||
note: inside `std::ptr::const_ptr::<impl *const i32>::is_null`
|
||||
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `std::ptr::const_ptr::<impl *const T>::is_null::compiletime`
|
||||
--> $SRC_DIR/core/src/panic.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
||||
@@ -5,7 +5,11 @@ LL | assert!(a == b);
|
||||
| ^^^^^^ evaluation of `_` failed inside this call
|
||||
|
|
||||
note: inside `<TypeId as PartialEq>::eq`
|
||||
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/any.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `<TypeId as PartialEq>::eq::compiletime`
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
= note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
@@ -5,7 +5,11 @@ LL | assert!(a == b);
|
||||
| ^^^^^^ evaluation of `_` failed inside this call
|
||||
|
|
||||
note: inside `<TypeId as PartialEq>::eq`
|
||||
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/any.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `<TypeId as PartialEq>::eq::compiletime`
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
= note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
@@ -5,7 +5,11 @@ LL | assert!(a == b);
|
||||
| ^^^^^^ evaluation of `_` failed inside this call
|
||||
|
|
||||
note: inside `<TypeId as PartialEq>::eq`
|
||||
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/any.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `<TypeId as PartialEq>::eq::compiletime`
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
= note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
@@ -5,7 +5,11 @@ LL | assert!(b == b);
|
||||
| ^^^^^^ evaluation of `_` failed inside this call
|
||||
|
|
||||
note: inside `<TypeId as PartialEq>::eq`
|
||||
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/any.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `<TypeId as PartialEq>::eq::compiletime`
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
= note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
@@ -5,7 +5,11 @@ LL | id == id
|
||||
| ^^^^^^^^ evaluation of `X` failed inside this call
|
||||
|
|
||||
note: inside `<TypeId as PartialEq>::eq`
|
||||
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/any.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: inside `<TypeId as PartialEq>::eq::compiletime`
|
||||
--> $SRC_DIR/core/src/any.rs:LL:COL
|
||||
= note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
error: constant evaluation is taking a long time
|
||||
--> $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
|
||||
|
|
||||
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
::: $SRC_DIR/core/src/num/mod.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
|
|
||||
= note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
|
||||
If your compilation actually takes a long time, you can safely allow the lint.
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
// Tests that ambiguously glob importing main doesn't fail to compile in non-executable crates
|
||||
// Regression test for #149412
|
||||
//@ check-pass
|
||||
#![crate_type = "lib"]
|
||||
|
||||
mod m1 { pub(crate) fn main() {} }
|
||||
mod m2 { pub(crate) fn main() {} }
|
||||
|
||||
use m1::*;
|
||||
use m2::*;
|
||||
@@ -12,16 +12,6 @@ LL | | drop((x.0, x.1, x.2));
|
||||
| | --- use occurs due to use in closure
|
||||
LL | | });
|
||||
| |_________- value moved here, in previous iteration of loop
|
||||
|
|
||||
help: consider moving the expression out of the loop so it is only moved once
|
||||
|
|
||||
LL ~ let mut value = std::thread::spawn(use || {
|
||||
LL +
|
||||
LL + drop((x.0, x.1, x.2));
|
||||
LL + });
|
||||
LL ~ for _ in 0..10 {
|
||||
LL ~ let handler = value;
|
||||
|
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
||||
@@ -4,10 +4,10 @@ error[E0422]: cannot find struct, variant or union type `MyStruct` in this scope
|
||||
LL | let x = MyStruct {};
|
||||
| ^^^^^^^^ not found in this scope
|
||||
|
|
||||
::: $DIR/auxiliary/use_by_macro.rs:15:1
|
||||
::: $DIR/auxiliary/use_by_macro.rs:7:24
|
||||
|
|
||||
LL | x!(my_struct);
|
||||
| ------------- you might have meant to refer to this struct
|
||||
LL | pub struct MyStruct;
|
||||
| -------- you might have meant to refer to this struct
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
||||
@@ -33,13 +33,19 @@ LL | n + sum_to(n - 1)
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u32` implements `Add<u32>`
|
||||
= note: `u32` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u32` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&u32` implements `Add<u32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u32` implements `Add<&u32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u32` implements `Add`
|
||||
= note: `&u32` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 2 previous errors; 1 warning emitted
|
||||
|
||||
@@ -8,10 +8,13 @@ LL | glob_vs_expanded::mac!();
|
||||
= note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
|
||||
= note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution
|
||||
note: `mac` could refer to the macro defined here
|
||||
--> $DIR/auxiliary/glob-vs-expanded.rs:11:1
|
||||
--> $DIR/auxiliary/glob-vs-expanded.rs:9:13
|
||||
|
|
||||
LL | () => { pub macro mac() {} }
|
||||
| ^^^^^^^^^^^^^
|
||||
LL | }
|
||||
LL | define_mac!();
|
||||
| ^^^^^^^^^^^^^
|
||||
| ------------- in this macro invocation
|
||||
note: `mac` could also refer to the macro defined here
|
||||
--> $DIR/auxiliary/glob-vs-expanded.rs:5:9
|
||||
|
|
||||
@@ -33,10 +36,13 @@ LL | glob_vs_expanded::mac!();
|
||||
= note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
|
||||
= note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution
|
||||
note: `mac` could refer to the macro defined here
|
||||
--> $DIR/auxiliary/glob-vs-expanded.rs:11:1
|
||||
--> $DIR/auxiliary/glob-vs-expanded.rs:9:13
|
||||
|
|
||||
LL | () => { pub macro mac() {} }
|
||||
| ^^^^^^^^^^^^^
|
||||
LL | }
|
||||
LL | define_mac!();
|
||||
| ^^^^^^^^^^^^^
|
||||
| ------------- in this macro invocation
|
||||
note: `mac` could also refer to the macro defined here
|
||||
--> $DIR/auxiliary/glob-vs-expanded.rs:5:9
|
||||
|
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
error: recursion limit reached while expanding `$crate::format_args!`
|
||||
--> $DIR/issue-41731-infinite-macro-print.rs:14:5
|
||||
--> $DIR/issue-41731-infinite-macro-print.rs:8:13
|
||||
|
|
||||
LL | print!(stack!($overflow))
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
...
|
||||
LL | stack!("overflow");
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
| ------------------ in this macro invocation
|
||||
|
|
||||
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "10"]` attribute to your crate (`issue_41731_infinite_macro_print`)
|
||||
= note: this error originates in the macro `print` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
@@ -23,10 +26,13 @@ LL | stack!("overflow");
|
||||
= note: to `{ $crate :: io :: _print($crate :: format_args! (stack! ("overflow"))); }`
|
||||
|
||||
error: format argument must be a string literal
|
||||
--> $DIR/issue-41731-infinite-macro-print.rs:14:5
|
||||
--> $DIR/issue-41731-infinite-macro-print.rs:8:13
|
||||
|
|
||||
LL | print!(stack!($overflow))
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
...
|
||||
LL | stack!("overflow");
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
| ------------------ in this macro invocation
|
||||
|
|
||||
= note: this error originates in the macro `print` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: you might be missing a string literal to format with
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
error: recursion limit reached while expanding `$crate::format_args_nl!`
|
||||
--> $DIR/issue-41731-infinite-macro-println.rs:14:5
|
||||
--> $DIR/issue-41731-infinite-macro-println.rs:8:13
|
||||
|
|
||||
LL | println!(stack!($overflow))
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
...
|
||||
LL | stack!("overflow");
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
| ------------------ in this macro invocation
|
||||
|
|
||||
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "10"]` attribute to your crate (`issue_41731_infinite_macro_println`)
|
||||
= note: this error originates in the macro `println` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
@@ -23,10 +26,13 @@ LL | stack!("overflow");
|
||||
= note: to `{ $crate :: io :: _print($crate :: format_args_nl! (stack! ("overflow"))); }`
|
||||
|
||||
error: format argument must be a string literal
|
||||
--> $DIR/issue-41731-infinite-macro-println.rs:14:5
|
||||
--> $DIR/issue-41731-infinite-macro-println.rs:8:13
|
||||
|
|
||||
LL | println!(stack!($overflow))
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
...
|
||||
LL | stack!("overflow");
|
||||
| ^^^^^^^^^^^^^^^^^^
|
||||
| ------------------ in this macro invocation
|
||||
|
|
||||
= note: this error originates in the macro `println` which comes from the expansion of the macro `stack` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: you might be missing a string literal to format with
|
||||
|
||||
@@ -35,10 +35,14 @@ LL | println!("{}", scores.sum::<i32>());
|
||||
= help: the trait `Sum<()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain-fixable.rs:14:10
|
||||
|
|
||||
@@ -72,10 +76,14 @@ LL | .sum::<i32>(),
|
||||
= help: the trait `Sum<()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain-fixable.rs:23:14
|
||||
|
|
||||
@@ -109,10 +117,14 @@ LL | println!("{}", vec![0, 1].iter().map(|x| { x; }).sum::<i32>());
|
||||
= help: the trait `Sum<()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain-fixable.rs:27:38
|
||||
|
|
||||
|
||||
@@ -9,10 +9,14 @@ LL | let x = Some(()).iter().map(|()| 1).sum::<f32>();
|
||||
= help: the trait `Sum<{integer}>` is not implemented for `f32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Sum<&f32>`
|
||||
|
|
||||
= note: `f32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Sum<&f32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain-with-int-infer.rs:2:29
|
||||
|
|
||||
|
||||
@@ -35,10 +35,14 @@ LL | println!("{}", scores.sum::<i32>());
|
||||
= help: the trait `Sum<()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain.rs:12:10
|
||||
|
|
||||
@@ -71,10 +75,14 @@ LL | .sum::<i32>(),
|
||||
= help: the trait `Sum<()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain.rs:25:14
|
||||
|
|
||||
@@ -114,10 +122,14 @@ LL | .sum::<i32>(),
|
||||
= help: the trait `Sum<f64>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain.rs:33:14
|
||||
|
|
||||
@@ -148,10 +160,14 @@ LL | println!("{}", vec![0, 1].iter().map(|x| { x; }).sum::<i32>());
|
||||
= help: the trait `Sum<()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain.rs:38:38
|
||||
|
|
||||
@@ -180,10 +196,14 @@ LL | println!("{}", vec![(), ()].iter().sum::<i32>());
|
||||
= help: the trait `Sum<&()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/invalid-iterator-chain.rs:39:33
|
||||
|
|
||||
|
||||
@@ -26,13 +26,19 @@ LL | 2 as usize - Some(1);
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&usize` implements `Sub<usize>`
|
||||
= note: `usize` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&usize` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&usize` implements `Sub<usize>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `usize` implements `Sub<&usize>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `usize` implements `Sub`
|
||||
= note: `&usize` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot multiply `{integer}` by `()`
|
||||
|
||||
@@ -8,13 +8,19 @@ LL | 1.0f64 - 1
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
= note: `f64` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub`
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
use std::thread;
|
||||
use std::sync::{Arc, Mutex, Condvar};
|
||||
use std::collections::VecDeque;
|
||||
|
||||
type Job = Box<dyn FnOnce() + Send + 'static>;
|
||||
|
||||
struct ThreadPool {
|
||||
workers: Vec<thread::JoinHandle<()>>,
|
||||
queue: Arc<()>,
|
||||
}
|
||||
|
||||
impl ThreadPool {
|
||||
fn execute<F>(&self, f: F)
|
||||
where
|
||||
F: FnOnce() + Send + 'static,
|
||||
{
|
||||
panic!()
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let results = Arc::new(Mutex::new(Vec::new())); //~ NOTE move occurs because
|
||||
let pool = ThreadPool {
|
||||
workers: vec![],
|
||||
queue: Arc::new(()),
|
||||
};
|
||||
|
||||
for i in 0..20 { //~ NOTE inside of this loop
|
||||
// let results = Arc::clone(&results); // Forgot this.
|
||||
pool.execute(move || { //~ ERROR E0382
|
||||
//~^ NOTE value moved into closure here, in previous iteration of loop
|
||||
//~| HELP consider cloning the value before moving it into the closure
|
||||
let mut r = results.lock().unwrap(); //~ NOTE use occurs due to use in closure
|
||||
r.push(i);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
error[E0382]: use of moved value: `results`
|
||||
--> $DIR/arc-consumed-in-looped-closure.rs:30:22
|
||||
|
|
||||
LL | let results = Arc::new(Mutex::new(Vec::new()));
|
||||
| ------- move occurs because `results` has type `Arc<std::sync::Mutex<Vec<i32>>>`, which does not implement the `Copy` trait
|
||||
...
|
||||
LL | for i in 0..20 {
|
||||
| -------------- inside of this loop
|
||||
LL | // let results = Arc::clone(&results); // Forgot this.
|
||||
LL | pool.execute(move || {
|
||||
| ^^^^^^^ value moved into closure here, in previous iteration of loop
|
||||
...
|
||||
LL | let mut r = results.lock().unwrap();
|
||||
| ------- use occurs due to use in closure
|
||||
|
|
||||
help: consider cloning the value before moving it into the closure
|
||||
|
|
||||
LL ~ let value = results.clone();
|
||||
LL ~ pool.execute(move || {
|
||||
LL |
|
||||
LL |
|
||||
LL ~ let mut r = value.lock().unwrap();
|
||||
|
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0382`.
|
||||
@@ -7,8 +7,6 @@ fn foo() {
|
||||
//~^ NOTE this reinitialization might get skipped
|
||||
//~| NOTE move occurs because `foo` has type `String`
|
||||
//~| NOTE inside of this loop
|
||||
//~| HELP consider moving the expression out of the loop
|
||||
//~| NOTE in this expansion of desugaring of `for` loop
|
||||
//~| NOTE
|
||||
//~| NOTE
|
||||
baz.push(foo);
|
||||
@@ -35,8 +33,6 @@ fn main() {
|
||||
//~| NOTE
|
||||
for bar in &bars {
|
||||
//~^ NOTE inside of this loop
|
||||
//~| HELP consider moving the expression out of the loop
|
||||
//~| NOTE in this expansion of desugaring of `for` loop
|
||||
//~| NOTE
|
||||
if foo == *bar {
|
||||
baz.push(foo);
|
||||
@@ -44,7 +40,7 @@ fn main() {
|
||||
//~| HELP consider cloning the value
|
||||
continue;
|
||||
//~^ NOTE verify that your loop breaking logic is correct
|
||||
//~| NOTE this `continue` advances the loop at line 36
|
||||
//~| NOTE this `continue` advances the loop at line 34
|
||||
}
|
||||
}
|
||||
qux.push(foo);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
error[E0382]: use of moved value: `foo`
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:21:14
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:19:14
|
||||
|
|
||||
LL | for foo in foos { for bar in &bars { if foo == *bar {
|
||||
| --- ---------------- inside of this loop
|
||||
@@ -14,29 +14,20 @@ LL | qux.push(foo);
|
||||
| ^^^ value used here after move
|
||||
|
|
||||
note: verify that your loop breaking logic is correct
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:17:9
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:15:9
|
||||
|
|
||||
LL | for foo in foos { for bar in &bars { if foo == *bar {
|
||||
| --------------- ----------------
|
||||
...
|
||||
LL | continue;
|
||||
| ^^^^^^^^ this `continue` advances the loop at $DIR/nested-loop-moved-value-wrong-continue.rs:6:23: 20:8
|
||||
help: consider moving the expression out of the loop so it is only moved once
|
||||
|
|
||||
LL ~ for foo in foos { let mut value = baz.push(foo);
|
||||
LL ~ for bar in &bars { if foo == *bar {
|
||||
LL |
|
||||
...
|
||||
LL |
|
||||
LL ~ value;
|
||||
|
|
||||
| ^^^^^^^^ this `continue` advances the loop at $DIR/nested-loop-moved-value-wrong-continue.rs:6:23: 18:8
|
||||
help: consider cloning the value if the performance cost is acceptable
|
||||
|
|
||||
LL | baz.push(foo.clone());
|
||||
| ++++++++
|
||||
|
||||
error[E0382]: use of moved value: `foo`
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:50:18
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:46:18
|
||||
|
|
||||
LL | for foo in foos {
|
||||
| ---
|
||||
@@ -54,7 +45,7 @@ LL | qux.push(foo);
|
||||
| ^^^ value used here after move
|
||||
|
|
||||
note: verify that your loop breaking logic is correct
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:45:17
|
||||
--> $DIR/nested-loop-moved-value-wrong-continue.rs:41:17
|
||||
|
|
||||
LL | for foo in foos {
|
||||
| ---------------
|
||||
@@ -63,16 +54,7 @@ LL | for bar in &bars {
|
||||
| ----------------
|
||||
...
|
||||
LL | continue;
|
||||
| ^^^^^^^^ this `continue` advances the loop at line 36
|
||||
help: consider moving the expression out of the loop so it is only moved once
|
||||
|
|
||||
LL ~ let mut value = baz.push(foo);
|
||||
LL ~ for bar in &bars {
|
||||
LL |
|
||||
...
|
||||
LL | if foo == *bar {
|
||||
LL ~ value;
|
||||
|
|
||||
| ^^^^^^^^ this `continue` advances the loop at line 34
|
||||
help: consider cloning the value if the performance cost is acceptable
|
||||
|
|
||||
LL | baz.push(foo.clone());
|
||||
|
||||
@@ -8,13 +8,19 @@ LL | 2_usize + (loop {});
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&usize` implements `Add<usize>`
|
||||
= note: `usize` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&usize` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&usize` implements `Add<usize>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `usize` implements `Add<&usize>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `usize` implements `Add`
|
||||
= note: `&usize` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
@@ -8,13 +8,19 @@ LL | x + 100.0
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Add<u8>`
|
||||
= note: `u8` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Add<u8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u8` implements `Add<&u8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u8` implements `Add`
|
||||
= note: `&u8` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot add `&str` to `f64`
|
||||
@@ -27,13 +33,19 @@ LL | x + "foo"
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add<f64>`
|
||||
= note: `f64` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Add<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Add`
|
||||
= note: `&f64` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot add `{integer}` to `f64`
|
||||
@@ -46,13 +58,19 @@ LL | x + y
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add<f64>`
|
||||
= note: `f64` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Add<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Add`
|
||||
= note: `&f64` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot subtract `{float}` from `u8`
|
||||
@@ -65,13 +83,19 @@ LL | x - 100.0
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Sub<u8>`
|
||||
= note: `u8` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Sub<u8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u8` implements `Sub<&u8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u8` implements `Sub`
|
||||
= note: `&u8` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot subtract `&str` from `f64`
|
||||
@@ -84,13 +108,19 @@ LL | x - "foo"
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
= note: `f64` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub`
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot subtract `{integer}` from `f64`
|
||||
@@ -103,13 +133,19 @@ LL | x - y
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
= note: `f64` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub`
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot multiply `u8` by `{float}`
|
||||
@@ -122,13 +158,19 @@ LL | x * 100.0
|
||||
help: the following other types implement trait `Mul<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Mul<u8>`
|
||||
= note: `u8` implements `Mul`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Mul`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&u8` implements `Mul<u8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u8` implements `Mul<&u8>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `u8` implements `Mul`
|
||||
= note: `&u8` implements `Mul`
|
||||
= note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot multiply `f64` by `&str`
|
||||
@@ -141,13 +183,19 @@ LL | x * "foo"
|
||||
help: the following other types implement trait `Mul<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul<f64>`
|
||||
= note: `f64` implements `Mul`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Mul<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Mul`
|
||||
= note: `&f64` implements `Mul`
|
||||
= note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot multiply `f64` by `{integer}`
|
||||
@@ -160,13 +208,19 @@ LL | x * y
|
||||
help: the following other types implement trait `Mul<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul<f64>`
|
||||
= note: `f64` implements `Mul`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Mul<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Mul`
|
||||
= note: `&f64` implements `Mul`
|
||||
= note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot divide `u8` by `{float}`
|
||||
@@ -193,13 +247,19 @@ LL | x / "foo"
|
||||
help: the following other types implement trait `Div<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div<f64>`
|
||||
= note: `f64` implements `Div`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Div<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Div`
|
||||
= note: `&f64` implements `Div`
|
||||
= note: this error originates in the macro `div_impl_float` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0277]: cannot divide `f64` by `{integer}`
|
||||
@@ -212,13 +272,19 @@ LL | x / y
|
||||
help: the following other types implement trait `Div<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div<f64>`
|
||||
= note: `f64` implements `Div`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Div<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Div`
|
||||
= note: `&f64` implements `Div`
|
||||
= note: this error originates in the macro `div_impl_float` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 12 previous errors
|
||||
|
||||
@@ -8,13 +8,19 @@ LL | x + 100
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Add<f32>`
|
||||
= note: `f32` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Add<f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Add<&f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Add`
|
||||
= note: `&f32` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -31,13 +37,19 @@ LL | x + 100
|
||||
help: the following other types implement trait `Add<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add<f64>`
|
||||
= note: `f64` implements `Add`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Add<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Add<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Add`
|
||||
= note: `&f64` implements `Add`
|
||||
= note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -54,13 +66,19 @@ LL | x - 100
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Sub<f32>`
|
||||
= note: `f32` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Sub<f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Sub<&f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Sub`
|
||||
= note: `&f32` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -77,13 +95,19 @@ LL | x - 100
|
||||
help: the following other types implement trait `Sub<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
= note: `f64` implements `Sub`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Sub<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Sub`
|
||||
= note: `&f64` implements `Sub`
|
||||
= note: this error originates in the macro `sub_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -100,13 +124,19 @@ LL | x * 100
|
||||
help: the following other types implement trait `Mul<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Mul<f32>`
|
||||
= note: `f32` implements `Mul`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Mul`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Mul<f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Mul<&f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Mul`
|
||||
= note: `&f32` implements `Mul`
|
||||
= note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -123,13 +153,19 @@ LL | x * 100
|
||||
help: the following other types implement trait `Mul<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul<f64>`
|
||||
= note: `f64` implements `Mul`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Mul<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Mul<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Mul`
|
||||
= note: `&f64` implements `Mul`
|
||||
= note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -146,13 +182,19 @@ LL | x / 100
|
||||
help: the following other types implement trait `Div<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Div<f32>`
|
||||
= note: `f32` implements `Div`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Div`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f32` implements `Div<f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Div<&f32>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f32` implements `Div`
|
||||
= note: `&f32` implements `Div`
|
||||
= note: this error originates in the macro `div_impl_float` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
@@ -169,13 +211,19 @@ LL | x / 100
|
||||
help: the following other types implement trait `Div<Rhs>`
|
||||
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div<f64>`
|
||||
= note: `f64` implements `Div`
|
||||
::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div`
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `&f64` implements `Div<f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Div<&f64>`
|
||||
::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
|
||||
|
|
||||
= note: `f64` implements `Div`
|
||||
= note: `&f64` implements `Div`
|
||||
= note: this error originates in the macro `div_impl_float` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider using a floating-point literal by writing it with `.0`
|
||||
|
|
||||
|
||||
@@ -28,6 +28,9 @@ help: the following other types implement trait `SliceIndex<T>`
|
||||
--> $SRC_DIR/core/src/bstr/traits.rs:LL:COL
|
||||
|
|
||||
= note: `RangeTo<usize>` implements `SliceIndex<ByteStr>`
|
||||
::: $SRC_DIR/core/src/bstr/traits.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
--> $SRC_DIR/core/src/str/traits.rs:LL:COL
|
||||
|
|
||||
= note: `RangeTo<usize>` implements `SliceIndex<str>`
|
||||
|
||||
@@ -9,10 +9,14 @@ LL | vec![(), ()].iter().sum::<i32>();
|
||||
= help: the trait `Sum<&()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Sum<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Sum`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Sum<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/sum.rs:4:18
|
||||
|
|
||||
@@ -35,10 +39,14 @@ LL | vec![(), ()].iter().product::<i32>();
|
||||
= help: the trait `Product<&()>` is not implemented for `i32`
|
||||
help: the following other types implement trait `Product<A>`
|
||||
--> $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Product<&i32>`
|
||||
|
|
||||
= note: `i32` implements `Product`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: `i32` implements `Product<&i32>`
|
||||
::: $SRC_DIR/core/src/iter/traits/accum.rs:LL:COL
|
||||
|
|
||||
= note: in this macro invocation
|
||||
note: the method call chain might not have had the expected associated types
|
||||
--> $DIR/sum.rs:7:18
|
||||
|
|
||||
|
||||
@@ -112,10 +112,13 @@ LL | test!();
|
||||
= note: this error originates in the macro `with_crate` which comes from the expansion of the macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0432]: unresolved import `$crate`
|
||||
--> $DIR/mixed-site-span.rs:69:5
|
||||
--> $DIR/mixed-site-span.rs:67:9
|
||||
|
|
||||
LL | invoke_with_ident!{$crate call proc_macro_item}
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `proc_macro_item` in the root
|
||||
LL | }}
|
||||
LL | test!();
|
||||
| ^^^^^^^ no `proc_macro_item` in the root
|
||||
| ------- in this macro invocation
|
||||
|
|
||||
= note: this error originates in the macro `with_crate` which comes from the expansion of the macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
@@ -262,10 +265,13 @@ LL + token_site_span::TokenItem as _
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `$crate`
|
||||
--> $DIR/mixed-site-span.rs:110:5
|
||||
--> $DIR/mixed-site-span.rs:106:9
|
||||
|
|
||||
LL | invoke_with_ident!{$crate mixed TokenItem}
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `TokenItem` in the root
|
||||
...
|
||||
LL | test!();
|
||||
| ^^^^^^^ no `TokenItem` in the root
|
||||
| ------- in this macro invocation
|
||||
|
|
||||
= note: this error originates in the macro `with_crate` which comes from the expansion of the macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider importing this struct instead
|
||||
@@ -417,10 +423,13 @@ LL + ($m:ident $s:ident $i:ident) => { ItemUse as _ };
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `$crate`
|
||||
--> $DIR/mixed-site-span.rs:150:5
|
||||
--> $DIR/mixed-site-span.rs:145:9
|
||||
|
|
||||
LL | invoke_with_ident!{$crate mixed ItemUse}
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `ItemUse` in the root
|
||||
...
|
||||
LL | test!();
|
||||
| ^^^^^^^ no `ItemUse` in the root
|
||||
| ------- in this macro invocation
|
||||
|
|
||||
= note: this error originates in the macro `with_crate` which comes from the expansion of the macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider importing this struct instead
|
||||
@@ -447,10 +456,13 @@ LL + ItemUse as _
|
||||
|
|
||||
|
||||
error[E0432]: unresolved import `$crate`
|
||||
--> $DIR/mixed-site-span.rs:150:5
|
||||
--> $DIR/mixed-site-span.rs:148:9
|
||||
|
|
||||
LL | invoke_with_ident!{$crate call ItemUse}
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `ItemUse` in the root
|
||||
LL | }}
|
||||
LL | test!();
|
||||
| ^^^^^^^ no `ItemUse` in the root
|
||||
| ------- in this macro invocation
|
||||
|
|
||||
= note: this error originates in the macro `with_crate` which comes from the expansion of the macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
help: consider importing this struct instead
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
macro_rules! macro_with_format { () => {
|
||||
fn check_5(arg : usize) -> String {
|
||||
let s : &str;
|
||||
if arg < 5 {
|
||||
s = format!("{arg}"); //~ ERROR mismatched types
|
||||
} else {
|
||||
s = String::new(); //~ ERROR mismatched types
|
||||
}
|
||||
String::from(s)
|
||||
}
|
||||
}}
|
||||
|
||||
fn main() {
|
||||
macro_with_format!();
|
||||
println!( "{}", check_5(6) );
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user