Skip to content

Commit 1ef1e7f

Browse files
eupnpunitkoura
eupn
and
punitkoura
committed
Bless ui test files
Co-authored-by: eupn <[email protected]> Co-authored-by: Punit Singh Koura <[email protected]>
1 parent 01f97c3 commit 1ef1e7f

File tree

269 files changed

+765
-750
lines changed

Some content is hidden

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

269 files changed

+765
-750
lines changed

‎src/librustc/traits/error_reporting.rs

Lines changed: 2 additions & 2 deletions
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 issue #48950 <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_lint/lib.rs

Lines changed: 26 additions & 13 deletions
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 issue #33685 <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 issue #36886 <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 issue #36888 <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 issue #36889 <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 issue #36890 <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 issue #36891 <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 issue #36892 <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 issue #37166 <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 issue #38260 <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 issue #48950 <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 issue #48950 <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 issue #57742 <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 issue #46205 <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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,8 +1668,8 @@ impl MirPass for QualifyAndPromoteConstants {
16681668
*span,
16691669
&format!("use of {} here does not actually short circuit due to \
16701670
the const evaluator presently not being able to do control flow. \
1671-
See issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more \
1672-
information.", kind),
1671+
See issue #49146 <https://github.com/rust-lang/rust/issues/49146> \
1672+
for more information.", kind),
16731673
);
16741674
}
16751675
for local in locals {

‎src/librustc_typeck/check/demand.rs

Lines changed: 2 additions & 2 deletions
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-
see issue #10184 <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/librustdoc/core.rs

Lines changed: 2 additions & 1 deletion
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 issue #44136 <https://github.com/rust-lang/rust/issues/44136>");
405+
msg.warn("please 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

Lines changed: 2 additions & 1 deletion
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("issue #29721 <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",

‎src/libsyntax/parse/literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ crate fn expect_no_suffix(diag: &Handler, sp: Span, kind: &str, suffix: Option<S
374374
);
375375
err.note(
376376
"see issue #60210 <https://github.com/rust-lang/rust/issues/60210> \
377-
for more information",
377+
for more information"
378378
);
379379
err
380380
} else {

‎src/test/rustdoc-ui/deprecated-attrs.stderr

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 5 additions & 5 deletions
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

Lines changed: 3 additions & 3 deletions
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

‎src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: lint level defined here
1010
LL | #![deny(keyword_idents)]
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 #49716 <https://github.com/rust-lang/rust/issues/49716>
13+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
1414

1515
error: `await` is a keyword in the 2018 edition
1616
--> $DIR/2015-edition-error-various-positions.rs:8:20
@@ -19,7 +19,7 @@ LL | pub struct await;
1919
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
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 #49716 <https://github.com/rust-lang/rust/issues/49716>
22+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
2323

2424
error: `await` is a keyword in the 2018 edition
2525
--> $DIR/2015-edition-error-various-positions.rs:12:16
@@ -28,7 +28,7 @@ LL | use outer_mod::await::await;
2828
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
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 #49716 <https://github.com/rust-lang/rust/issues/49716>
31+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
3232

3333
error: `await` is a keyword in the 2018 edition
3434
--> $DIR/2015-edition-error-various-positions.rs:12:23
@@ -37,7 +37,7 @@ LL | use outer_mod::await::await;
3737
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
3838
|
3939
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
40-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
40+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
4141

4242
error: `await` is a keyword in the 2018 edition
4343
--> $DIR/2015-edition-error-various-positions.rs:17:14
@@ -46,7 +46,7 @@ LL | struct Foo { await: () }
4646
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
4747
|
4848
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
49-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
49+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
5050

5151
error: `await` is a keyword in the 2018 edition
5252
--> $DIR/2015-edition-error-various-positions.rs:21:15
@@ -55,7 +55,7 @@ LL | impl Foo { fn await() {} }
5555
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
5656
|
5757
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
58-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
58+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
5959

6060
error: `await` is a keyword in the 2018 edition
6161
--> $DIR/2015-edition-error-various-positions.rs:25:14
@@ -64,7 +64,7 @@ LL | macro_rules! await {
6464
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
6565
|
6666
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
67-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
67+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
6868

6969
error: `await` is a keyword in the 2018 edition
7070
--> $DIR/2015-edition-error-various-positions.rs:32:5
@@ -73,7 +73,7 @@ LL | await!();
7373
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
7474
|
7575
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
76-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
76+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
7777

7878
error: `await` is a keyword in the 2018 edition
7979
--> $DIR/2015-edition-error-various-positions.rs:35:11
@@ -82,7 +82,7 @@ LL | match await { await => {} }
8282
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
8383
|
8484
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
85-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
85+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
8686

8787
error: `await` is a keyword in the 2018 edition
8888
--> $DIR/2015-edition-error-various-positions.rs:35:19
@@ -91,7 +91,7 @@ LL | match await { await => {} }
9191
| ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
9292
|
9393
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
94-
= note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
94+
= note: see issue #49716 <https://github.com/rust-lang/rust/issues/49716> for more information
9595

9696
error: aborting due to 10 previous errors
9797

0 commit comments

Comments
 (0)