Skip to content

Commit 07675af

Browse files
authored
Rollup merge of rust-lang#63008 - eupn:consistent-see-issue, r=varkor
Make "see issue" consistent Fixes rust-lang#62976. h/t to @punitkoura for initial patterns search. r? @varkor
2 parents 49c9b22 + 7336626 commit 07675af

File tree

277 files changed

+785
-764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+785
-764
lines changed

src/librustc/lint/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ pub fn struct_lint_level<'a>(sess: &'a Session,
737737
} else {
738738
format!("{} in a future release!", STANDARD_MESSAGE)
739739
};
740-
let citation = format!("for more information, see {}",
740+
let citation = format!("see {} for more information",
741741
future_incompatible.reference);
742742
err.warn(&explanation);
743743
err.note(&citation);

src/librustc/session/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1315,9 +1315,9 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
13151315
sess.target.target.options.is_like_msvc &&
13161316
sess.panic_strategy() == PanicStrategy::Unwind &&
13171317
sess.opts.prints.iter().all(|&p| p == PrintRequest::NativeStaticLibs) {
1318-
sess.err("Profile-guided optimization does not yet work in conjunction \
1318+
sess.err("profile-guided optimization does not yet work in conjunction \
13191319
with `-Cpanic=unwind` on Windows when targeting MSVC. \
1320-
See https://github.com/rust-lang/rust/issues/61002 for details.");
1320+
See issue #61002 <https://github.com/rust-lang/rust/issues/61002> for details.");
13211321
}
13221322
}
13231323

src/librustc/traits/error_reporting.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
728728
if self.predicate_may_hold(&unit_obligation) {
729729
err.note("the trait is implemented for `()`. \
730730
Possibly this error has been caused by changes to \
731-
Rust's type-inference algorithm \
732-
(see: https://github.com/rust-lang/rust/issues/48950 \
731+
Rust's type-inference algorithm (see issue #48950 \
732+
<https://github.com/rust-lang/rust/issues/48950> \
733733
for more info). Consider whether you meant to use the \
734734
type `()` here instead.");
735735
}

src/librustc/ty/error.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ impl<'tcx> TyCtxt<'tcx> {
287287
if ty.is_closure() || ty.is_generator() {
288288
db.note("closures cannot capture themselves or take themselves as argument;\n\
289289
this error may be the result of a recent compiler bug-fix,\n\
290-
see https://github.com/rust-lang/rust/issues/46062 for more details");
290+
see issue #46062 <https://github.com/rust-lang/rust/issues/46062> \
291+
for more information");
291292
}
292293
}
293294
_ => {}

src/librustc_lint/lib.rs

+26-13
Original file line numberDiff line numberDiff line change
@@ -457,37 +457,50 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
457457
store.register_removed("transmute_from_fn_item_types",
458458
"always cast functions before transmuting them");
459459
store.register_removed("hr_lifetime_in_assoc_type",
460-
"converted into hard error, see https://github.com/rust-lang/rust/issues/33685");
460+
"converted into hard error, \
461+
see issue #33685 <https://github.com/rust-lang/rust/issues/33685>");
461462
store.register_removed("inaccessible_extern_crate",
462-
"converted into hard error, see https://github.com/rust-lang/rust/issues/36886");
463+
"converted into hard error, \
464+
see issue #36886 <https://github.com/rust-lang/rust/issues/36886>");
463465
store.register_removed("super_or_self_in_global_path",
464-
"converted into hard error, see https://github.com/rust-lang/rust/issues/36888");
466+
"converted into hard error, \
467+
see issue #36888 <https://github.com/rust-lang/rust/issues/36888>");
465468
store.register_removed("overlapping_inherent_impls",
466-
"converted into hard error, see https://github.com/rust-lang/rust/issues/36889");
469+
"converted into hard error, \
470+
see issue #36889 <https://github.com/rust-lang/rust/issues/36889>");
467471
store.register_removed("illegal_floating_point_constant_pattern",
468-
"converted into hard error, see https://github.com/rust-lang/rust/issues/36890");
472+
"converted into hard error, \
473+
see issue #36890 <https://github.com/rust-lang/rust/issues/36890>");
469474
store.register_removed("illegal_struct_or_enum_constant_pattern",
470-
"converted into hard error, see https://github.com/rust-lang/rust/issues/36891");
475+
"converted into hard error, \
476+
see issue #36891 <https://github.com/rust-lang/rust/issues/36891>");
471477
store.register_removed("lifetime_underscore",
472-
"converted into hard error, see https://github.com/rust-lang/rust/issues/36892");
478+
"converted into hard error, \
479+
see issue #36892 <https://github.com/rust-lang/rust/issues/36892>");
473480
store.register_removed("extra_requirement_in_impl",
474-
"converted into hard error, see https://github.com/rust-lang/rust/issues/37166");
481+
"converted into hard error, \
482+
see issue #37166 <https://github.com/rust-lang/rust/issues/37166>");
475483
store.register_removed("legacy_imports",
476-
"converted into hard error, see https://github.com/rust-lang/rust/issues/38260");
484+
"converted into hard error, \
485+
see issue #38260 <https://github.com/rust-lang/rust/issues/38260>");
477486
store.register_removed("coerce_never",
478-
"converted into hard error, see https://github.com/rust-lang/rust/issues/48950");
487+
"converted into hard error, \
488+
see issue #48950 <https://github.com/rust-lang/rust/issues/48950>");
479489
store.register_removed("resolve_trait_on_defaulted_unit",
480-
"converted into hard error, see https://github.com/rust-lang/rust/issues/48950");
490+
"converted into hard error, \
491+
see issue #48950 <https://github.com/rust-lang/rust/issues/48950>");
481492
store.register_removed("private_no_mangle_fns",
482493
"no longer a warning, `#[no_mangle]` functions always exported");
483494
store.register_removed("private_no_mangle_statics",
484495
"no longer a warning, `#[no_mangle]` statics always exported");
485496
store.register_removed("bad_repr",
486497
"replaced with a generic attribute input check");
487498
store.register_removed("duplicate_matcher_binding_name",
488-
"converted into hard error, see https://github.com/rust-lang/rust/issues/57742");
499+
"converted into hard error, \
500+
see issue #57742 <https://github.com/rust-lang/rust/issues/57742>");
489501
store.register_removed("incoherent_fundamental_impls",
490-
"converted into hard error, see https://github.com/rust-lang/rust/issues/46205");
502+
"converted into hard error, \
503+
see issue #46205 <https://github.com/rust-lang/rust/issues/46205>");
491504
}
492505

493506
pub fn register_internals(store: &mut lint::LintStore, sess: Option<&Session>) {

src/librustc_mir/transform/qualify_consts.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1623,8 +1623,9 @@ impl MirPass for QualifyAndPromoteConstants {
16231623
"{}",
16241624
err,
16251625
);
1626-
diag.note("for more information, see issue \
1627-
https://github.com/rust-lang/rust/issues/57563");
1626+
diag.note("see issue \
1627+
#57563 <https://github.com/rust-lang/rust/issues/57563> \
1628+
for more information");
16281629
diag.help(
16291630
"add `#![feature(const_fn)]` to the crate attributes to enable",
16301631
);
@@ -1667,8 +1668,8 @@ impl MirPass for QualifyAndPromoteConstants {
16671668
*span,
16681669
&format!("use of {} here does not actually short circuit due to \
16691670
the const evaluator presently not being able to do control flow. \
1670-
See https://github.com/rust-lang/rust/issues/49146 for more \
1671-
information.", kind),
1671+
See issue #49146 <https://github.com/rust-lang/rust/issues/49146> \
1672+
for more information.", kind),
16721673
);
16731674
}
16741675
for local in locals {

src/librustc_typeck/check/demand.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -727,8 +727,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
727727
);
728728
err.warn("if the rounded value cannot be represented by the target \
729729
integer type, including `Inf` and `NaN`, casting will cause \
730-
undefined behavior \
731-
(https://github.com/rust-lang/rust/issues/10184)");
730+
undefined behavior. See issue #10184 \
731+
<https://github.com/rust-lang/rust/issues/10184>");
732732
}
733733
true
734734
}

src/librustc_typeck/check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4528,7 +4528,7 @@ fn fatally_break_rust(sess: &Session) {
45284528
handler.note_without_error("the compiler expectedly panicked. this is a feature.");
45294529
handler.note_without_error(
45304530
"we would appreciate a joke overview: \
4531-
https://github.com/rust-lang/rust/issues/43162#issuecomment-320764675"
4531+
see issue #43162 <https://github.com/rust-lang/rust/issues/43162#issuecomment-320764675>"
45324532
);
45334533
handler.note_without_error(&format!("rustc {} running on {}",
45344534
option_env!("CFG_VERSION").unwrap_or("unknown_version"),

src/librustdoc/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ fn check_deprecated_options(matches: &getopts::Matches, diag: &errors::Handler)
518518
if matches.opt_present(flag) {
519519
let mut err = diag.struct_warn(&format!("the '{}' flag is considered deprecated",
520520
flag));
521-
err.warn("please see https://github.com/rust-lang/rust/issues/44136");
521+
err.warn("see issue #44136 <https://github.com/rust-lang/rust/issues/44136>");
522522

523523
if *flag == "no-defaults" {
524524
err.help("you may want to use --document-private-items");

src/librustdoc/core.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
402402
fn report_deprecated_attr(name: &str, diag: &errors::Handler) {
403403
let mut msg = diag.struct_warn(&format!("the `#![doc({})]` attribute is \
404404
considered deprecated", name));
405-
msg.warn("please see https://github.com/rust-lang/rust/issues/44136");
405+
msg.warn("see issue \
406+
#44136 <https://github.com/rust-lang/rust/issues/44136>");
406407

407408
if name == "no_default_passes" {
408409
msg.help("you may want to use `#![doc(document_private_items)]`");

src/libsyntax/feature_gate.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,8 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
13911391
(sym::link_section, Whitelisted, template!(NameValueStr: "name"), Ungated),
13921392
(sym::no_builtins, Whitelisted, template!(Word), Ungated),
13931393
(sym::no_debug, Whitelisted, template!(Word), Gated(
1394-
Stability::Deprecated("https://github.com/rust-lang/rust/issues/29721", None),
1394+
Stability::Deprecated("issue #29721 <https://github.com/rust-lang/rust/issues/29721>",
1395+
None),
13951396
sym::no_debug,
13961397
"the `#[no_debug]` attribute was an experimental feature that has been \
13971398
deprecated due to lack of demand",
@@ -1748,7 +1749,9 @@ fn leveled_feature_err<'a, S: Into<MultiSpan>>(
17481749
None | Some(0) => {} // We still accept `0` as a stand-in for backwards compatibility
17491750
Some(n) => {
17501751
err.note(&format!(
1751-
"for more information, see https://github.com/rust-lang/rust/issues/{}",
1752+
"see issue #{} <https://github.com/rust-lang/rust/issues/{}> \
1753+
for more information",
1754+
n,
17521755
n,
17531756
));
17541757
}

src/libsyntax/parse/diagnostics.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ impl<'a> Parser<'a> {
411411
} else {
412412
err.note("`#![feature(type_ascription)]` lets you annotate an expression with a \
413413
type: `<expr>: <type>`");
414-
err.note("for more information, see \
415-
https://github.com/rust-lang/rust/issues/23416");
414+
err.note("see issue #23416 <https://github.com/rust-lang/rust/issues/23416> \
415+
for more information");
416416
}
417417
}
418418
}

src/libsyntax/parse/lexer/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,9 @@ impl<'a> StringReader<'a> {
303303
.warn("this was previously accepted by the compiler but is \
304304
being phased out; it will become a hard error in \
305305
a future release!")
306-
.note("for more information, see issue #42326 \
307-
<https://github.com/rust-lang/rust/issues/42326>")
306+
.note("see issue \
307+
#42326 <https://github.com/rust-lang/rust/issues/42326> \
308+
for more information")
308309
.emit();
309310
None
310311
} else {

src/libsyntax/parse/literal.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ crate fn expect_no_suffix(diag: &Handler, sp: Span, kind: &str, suffix: Option<S
373373
to tuple field access",
374374
);
375375
err.note(
376-
"for more context, see https://github.com/rust-lang/rust/issues/60210",
376+
"see issue #60210 <https://github.com/rust-lang/rust/issues/60210> \
377+
for more information"
377378
);
378379
err
379380
} else {
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
warning: the `#![doc(no_default_passes)]` attribute is considered deprecated
22
|
3-
= warning: please see https://github.com/rust-lang/rust/issues/44136
3+
= warning: see issue #44136 <https://github.com/rust-lang/rust/issues/44136>
44
= help: you may want to use `#![doc(document_private_items)]`
55

66
warning: the `#![doc(passes = "...")]` attribute is considered deprecated
77
|
8-
= warning: please see https://github.com/rust-lang/rust/issues/44136
8+
= warning: see issue #44136 <https://github.com/rust-lang/rust/issues/44136>
99

src/test/ui-fulldeps/gated-plugin.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0658]: compiler plugins are experimental and possibly buggy
44
LL | #![plugin(attr_plugin_test)]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: for more information, see https://github.com/rust-lang/rust/issues/29597
7+
= note: see issue #29597 <https://github.com/rust-lang/rust/issues/29597> for more information
88
= help: add `#![feature(plugin)]` to the crate attributes to enable
99

1010
error: aborting due to previous error

src/test/ui-fulldeps/hash-stable-is-unstable.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
88
LL | extern crate rustc_data_structures;
99
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1010
|
11-
= note: for more information, see https://github.com/rust-lang/rust/issues/27812
11+
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
1212
= help: add `#![feature(rustc_private)]` to the crate attributes to enable
1313

1414
error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -17,7 +17,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
1717
LL | extern crate rustc;
1818
| ^^^^^^^^^^^^^^^^^^^
1919
|
20-
= note: for more information, see https://github.com/rust-lang/rust/issues/27812
20+
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
2121
= help: add `#![feature(rustc_private)]` to the crate attributes to enable
2222

2323
error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -26,7 +26,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
2626
LL | extern crate rustc_macros;
2727
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2828
|
29-
= note: for more information, see https://github.com/rust-lang/rust/issues/27812
29+
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
3030
= help: add `#![feature(rustc_private)]` to the crate attributes to enable
3131

3232
error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -35,7 +35,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
3535
LL | use rustc_macros::HashStable;
3636
| ^^^^^^^^^^^^^^^^^^^^^^^^
3737
|
38-
= note: for more information, see https://github.com/rust-lang/rust/issues/27812
38+
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
3939
= help: add `#![feature(rustc_private)]` to the crate attributes to enable
4040

4141
error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -44,7 +44,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
4444
LL | #[derive(HashStable)]
4545
| ^^^^^^^^^^
4646
|
47-
= note: for more information, see https://github.com/rust-lang/rust/issues/27812
47+
= note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
4848
= help: add `#![feature(rustc_private)]` to the crate attributes to enable
4949

5050
error: aborting due to 6 previous errors

src/test/ui/anon-params-deprecated.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![warn(anonymous_parameters)]
1111
| ^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
13-
= note: for more information, see issue #41686 <https://github.com/rust-lang/rust/issues/41686>
13+
= note: see issue #41686 <https://github.com/rust-lang/rust/issues/41686> for more information
1414

1515
warning: anonymous parameters are deprecated and will be removed in the next edition.
1616
--> $DIR/anon-params-deprecated.rs:12:30
@@ -19,7 +19,7 @@ LL | fn bar_with_default_impl(String, String) {}
1919
| ^^^^^^ help: Try naming the parameter or explicitly ignoring it: `_: String`
2020
|
2121
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
22-
= note: for more information, see issue #41686 <https://github.com/rust-lang/rust/issues/41686>
22+
= note: see issue #41686 <https://github.com/rust-lang/rust/issues/41686> for more information
2323

2424
warning: anonymous parameters are deprecated and will be removed in the next edition.
2525
--> $DIR/anon-params-deprecated.rs:12:38
@@ -28,5 +28,5 @@ LL | fn bar_with_default_impl(String, String) {}
2828
| ^^^^^^ help: Try naming the parameter or explicitly ignoring it: `_: String`
2929
|
3030
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
31-
= note: for more information, see issue #41686 <https://github.com/rust-lang/rust/issues/41686>
31+
= note: see issue #41686 <https://github.com/rust-lang/rust/issues/41686> for more information
3232

0 commit comments

Comments
 (0)