Auto merge of #83441 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] 1.52.0 branch off r? `@Mark-Simulacrum`
This commit is contained in:
commit
6a1077d47f
|
@ -585,8 +585,11 @@ mod dist {
|
||||||
rustfix_coverage: false,
|
rustfix_coverage: false,
|
||||||
pass: None,
|
pass: None,
|
||||||
};
|
};
|
||||||
|
// Make sure rustfmt binary not being found isn't an error.
|
||||||
|
config.channel = "beta".to_string();
|
||||||
let build = Build::new(config);
|
let build = Build::new(config);
|
||||||
let mut builder = Builder::new(&build);
|
let mut builder = Builder::new(&build);
|
||||||
|
|
||||||
builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Test), &[]);
|
builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Test), &[]);
|
||||||
let a = TargetSelection::from_user("A");
|
let a = TargetSelection::from_user("A");
|
||||||
|
|
||||||
|
|
|
@ -1029,7 +1029,13 @@ impl Step for Rls {
|
||||||
let rls = builder
|
let rls = builder
|
||||||
.ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
|
.ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
|
||||||
.or_else(|| {
|
.or_else(|| {
|
||||||
missing_tool("RLS", builder.build.config.missing_tools);
|
// We ignore failure on aarch64 Windows because RLS currently
|
||||||
|
// fails to build, due to winapi 0.2 not supporting aarch64.
|
||||||
|
missing_tool(
|
||||||
|
"RLS",
|
||||||
|
builder.build.config.missing_tools
|
||||||
|
|| (target.triple.contains("aarch64") && target.triple.contains("windows")),
|
||||||
|
);
|
||||||
None
|
None
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ fi
|
||||||
#
|
#
|
||||||
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
|
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
|
||||||
# either automatically or manually.
|
# either automatically or manually.
|
||||||
export RUST_RELEASE_CHANNEL=nightly
|
export RUST_RELEASE_CHANNEL=beta
|
||||||
|
|
||||||
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
|
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
|
||||||
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
|
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
|
||||||
|
|
|
@ -12,14 +12,14 @@
|
||||||
# stable release's version number. `date` is the date where the release we're
|
# stable release's version number. `date` is the date where the release we're
|
||||||
# bootstrapping off was released.
|
# bootstrapping off was released.
|
||||||
|
|
||||||
date: 2021-02-14
|
date: 2021-03-23
|
||||||
rustc: beta
|
rustc: 1.51.0
|
||||||
|
|
||||||
# We use a nightly rustfmt to format the source because it solves some
|
# We use a nightly rustfmt to format the source because it solves some
|
||||||
# bootstrapping issues with use of new syntax in this repo. If you're looking at
|
# bootstrapping issues with use of new syntax in this repo. If you're looking at
|
||||||
# the beta/stable branch, this key should be omitted, as we don't want to depend
|
# the beta/stable branch, this key should be omitted, as we don't want to depend
|
||||||
# on rustfmt from nightly there.
|
# on rustfmt from nightly there.
|
||||||
rustfmt: nightly-2021-01-28
|
#rustfmt: nightly-2021-01-28
|
||||||
|
|
||||||
# When making a stable release the process currently looks like:
|
# When making a stable release the process currently looks like:
|
||||||
#
|
#
|
||||||
|
@ -39,4 +39,4 @@ rustfmt: nightly-2021-01-28
|
||||||
# looking at a beta source tarball and it's uncommented we'll shortly comment it
|
# looking at a beta source tarball and it's uncommented we'll shortly comment it
|
||||||
# out.
|
# out.
|
||||||
|
|
||||||
#dev: 1
|
dev: 1
|
||||||
|
|
|
@ -1,25 +1,20 @@
|
||||||
error: `#[derive(SessionDiagnostic)]` can only be used on structs
|
error: `#[derive(SessionDiagnostic)]` can only be used on structs
|
||||||
--> $DIR/session-derive-errors.rs:28:1
|
--> $DIR/session-derive-errors.rs:28:1
|
||||||
|
|
|
|
||||||
LL | / #[error = "E0123"]
|
LL | #[error = "E0123"]
|
||||||
LL | |
|
| ^
|
||||||
LL | | enum SessionDiagnosticOnEnum {
|
|
||||||
LL | | Foo,
|
|
||||||
LL | | Bar,
|
|
||||||
LL | | }
|
|
||||||
| |_^
|
|
||||||
|
|
||||||
error: `#[label = ...]` is not a valid SessionDiagnostic struct attribute
|
error: `#[label = ...]` is not a valid SessionDiagnostic struct attribute
|
||||||
--> $DIR/session-derive-errors.rs:37:1
|
--> $DIR/session-derive-errors.rs:37:1
|
||||||
|
|
|
|
||||||
LL | #[label = "This is in the wrong place"]
|
LL | #[label = "This is in the wrong place"]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^
|
||||||
|
|
||||||
error: `#[suggestion = ...]` is not a valid SessionDiagnostic field attribute
|
error: `#[suggestion = ...]` is not a valid SessionDiagnostic field attribute
|
||||||
--> $DIR/session-derive-errors.rs:44:5
|
--> $DIR/session-derive-errors.rs:44:5
|
||||||
|
|
|
|
||||||
LL | #[suggestion = "this is the wrong kind of attribute"]
|
LL | #[suggestion = "this is the wrong kind of attribute"]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^
|
||||||
|
|
||||||
error: `error` specified multiple times
|
error: `error` specified multiple times
|
||||||
--> $DIR/session-derive-errors.rs:52:11
|
--> $DIR/session-derive-errors.rs:52:11
|
||||||
|
@ -37,7 +32,7 @@ error: `code` not specified
|
||||||
--> $DIR/session-derive-errors.rs:67:1
|
--> $DIR/session-derive-errors.rs:67:1
|
||||||
|
|
|
|
||||||
LL | struct ErrorCodeNotProvided {}
|
LL | struct ErrorCodeNotProvided {}
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^^
|
||||||
|
|
|
|
||||||
= help: use the [code = "..."] attribute to set this diagnostic's error code
|
= help: use the [code = "..."] attribute to set this diagnostic's error code
|
||||||
|
|
||||||
|
@ -45,13 +40,13 @@ error: the `#[message = "..."]` attribute can only be applied to fields of type
|
||||||
--> $DIR/session-derive-errors.rs:95:5
|
--> $DIR/session-derive-errors.rs:95:5
|
||||||
|
|
|
|
||||||
LL | #[message = "this message is applied to a String field"]
|
LL | #[message = "this message is applied to a String field"]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^
|
||||||
|
|
||||||
error: `name` doesn't refer to a field on this type
|
error: `name` doesn't refer to a field on this type
|
||||||
--> $DIR/session-derive-errors.rs:102:1
|
--> $DIR/session-derive-errors.rs:102:1
|
||||||
|
|
|
|
||||||
LL | #[message = "This error has a field, and references {name}"]
|
LL | #[message = "This error has a field, and references {name}"]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^
|
||||||
|
|
||||||
error: invalid format string: expected `'}'` but string was terminated
|
error: invalid format string: expected `'}'` but string was terminated
|
||||||
--> $DIR/session-derive-errors.rs:110:1
|
--> $DIR/session-derive-errors.rs:110:1
|
||||||
|
@ -77,59 +72,53 @@ error: The `#[label = ...]` attribute can only be applied to fields of type Span
|
||||||
--> $DIR/session-derive-errors.rs:138:5
|
--> $DIR/session-derive-errors.rs:138:5
|
||||||
|
|
|
|
||||||
LL | #[label = "See here"]
|
LL | #[label = "See here"]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^
|
| ^
|
||||||
|
|
||||||
error: `nonsense` is not a valid key for `#[suggestion(...)]`
|
error: `nonsense` is not a valid key for `#[suggestion(...)]`
|
||||||
--> $DIR/session-derive-errors.rs:163:18
|
--> $DIR/session-derive-errors.rs:163:18
|
||||||
|
|
|
|
||||||
LL | #[suggestion(nonsense = "This is nonsense")]
|
LL | #[suggestion(nonsense = "This is nonsense")]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^
|
||||||
|
|
||||||
error: `msg` is not a valid key for `#[suggestion(...)]`
|
error: `msg` is not a valid key for `#[suggestion(...)]`
|
||||||
--> $DIR/session-derive-errors.rs:171:18
|
--> $DIR/session-derive-errors.rs:171:18
|
||||||
|
|
|
|
||||||
LL | #[suggestion(msg = "This is a suggestion")]
|
LL | #[suggestion(msg = "This is a suggestion")]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^
|
||||||
|
|
||||||
error: missing suggestion message
|
error: missing suggestion message
|
||||||
--> $DIR/session-derive-errors.rs:179:7
|
--> $DIR/session-derive-errors.rs:179:7
|
||||||
|
|
|
|
||||||
LL | #[suggestion(code = "This is suggested code")]
|
LL | #[suggestion(code = "This is suggested code")]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^
|
||||||
|
|
|
|
||||||
= help: provide a suggestion message using #[suggestion(message = "...")]
|
= help: provide a suggestion message using #[suggestion(message = "...")]
|
||||||
|
|
||||||
error: wrong field type for suggestion
|
error: wrong field type for suggestion
|
||||||
--> $DIR/session-derive-errors.rs:194:5
|
--> $DIR/session-derive-errors.rs:194:5
|
||||||
|
|
|
|
||||||
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
|
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||||
LL | |
|
| ^
|
||||||
LL | | suggestion: Applicability,
|
|
||||||
| |_____________________________^
|
|
||||||
|
|
|
|
||||||
= help: #[suggestion(...)] should be applied to fields of type Span or (Span, Applicability)
|
= help: #[suggestion(...)] should be applied to fields of type Span or (Span, Applicability)
|
||||||
|
|
||||||
error: type of field annotated with `#[suggestion(...)]` contains more than one Span
|
error: type of field annotated with `#[suggestion(...)]` contains more than one Span
|
||||||
--> $DIR/session-derive-errors.rs:209:5
|
--> $DIR/session-derive-errors.rs:209:5
|
||||||
|
|
|
|
||||||
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
|
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||||
LL | |
|
| ^
|
||||||
LL | | suggestion: (Span, Span, Applicability),
|
|
||||||
| |___________________________________________^
|
|
||||||
|
|
||||||
error: type of field annotated with `#[suggestion(...)]` contains more than one Applicability
|
error: type of field annotated with `#[suggestion(...)]` contains more than one Applicability
|
||||||
--> $DIR/session-derive-errors.rs:217:5
|
--> $DIR/session-derive-errors.rs:217:5
|
||||||
|
|
|
|
||||||
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
|
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||||
LL | |
|
| ^
|
||||||
LL | | suggestion: (Applicability, Applicability, Span),
|
|
||||||
| |____________________________________________________^
|
|
||||||
|
|
||||||
error: invalid annotation list `#[label(...)]`
|
error: invalid annotation list `#[label(...)]`
|
||||||
--> $DIR/session-derive-errors.rs:225:7
|
--> $DIR/session-derive-errors.rs:225:7
|
||||||
|
|
|
|
||||||
LL | #[label("wrong kind of annotation for label")]
|
LL | #[label("wrong kind of annotation for label")]
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^
|
||||||
|
|
||||||
error: aborting due to 18 previous errors
|
error: aborting due to 18 previous errors
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue