Auto merge of #79132 - pietroalbini:beta-next, r=Mark-Simulacrum
Prepare beta 1.49.0 This PR sets everything up for beta 1.49.0, and backports the following PRs to it: * #79107 - build-manifest: strip newline from rustc version * #78986 - Avoid installing external LLVM dylibs * #79074 - Install CI llvm into the library directory * #78364 - Update RELEASES.md for 1.48.0 * #77939 - Ensure that the source code display is working with DOS backline r? `@ghost` cc `@rust-lang/release`
This commit is contained in:
bors
commit
87776d7d53
@ -1336,7 +1336,13 @@ impl Step for Rls {
|
||||
let rls = builder
|
||||
.ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
|
||||
.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
|
||||
})?;
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ fi
|
||||
#
|
||||
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
|
||||
# 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
|
||||
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
|
||||
# `0.(x+1).0` for Cargo where they were released on `date`.
|
||||
|
||||
date: 2020-10-16
|
||||
rustc: beta
|
||||
cargo: beta
|
||||
date: 2020-11-16
|
||||
rustc: 1.48.0
|
||||
cargo: 1.48.0
|
||||
|
||||
# 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
|
||||
# the beta/stable branch, this key should be omitted, as we don't want to depend
|
||||
# on rustfmt from nightly there.
|
||||
rustfmt: nightly-2020-10-12
|
||||
#rustfmt: nightly-2020-10-12
|
||||
|
||||
# When making a stable release the process currently looks like:
|
||||
#
|
||||
@ -40,4 +40,4 @@ rustfmt: nightly-2020-10-12
|
||||
# looking at a beta source tarball and it's uncommented we'll shortly comment it
|
||||
# out.
|
||||
|
||||
#dev: 1
|
||||
dev: 1
|
||||
|
||||
@ -1,25 +1,20 @@
|
||||
error: `#[derive(SessionDiagnostic)]` can only be used on structs
|
||||
--> $DIR/session-derive-errors.rs:28:1
|
||||
|
|
||||
LL | / #[error = "E0123"]
|
||||
LL | |
|
||||
LL | | enum SessionDiagnosticOnEnum {
|
||||
LL | | Foo,
|
||||
LL | | Bar,
|
||||
LL | | }
|
||||
| |_^
|
||||
LL | #[error = "E0123"]
|
||||
| ^
|
||||
|
||||
error: `#[label = ...]` is not a valid SessionDiagnostic struct attribute
|
||||
--> $DIR/session-derive-errors.rs:37:1
|
||||
|
|
||||
LL | #[label = "This is in the wrong place"]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^
|
||||
|
||||
error: `#[suggestion = ...]` is not a valid SessionDiagnostic field attribute
|
||||
--> $DIR/session-derive-errors.rs:44:5
|
||||
|
|
||||
LL | #[suggestion = "this is the wrong kind of attribute"]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^
|
||||
|
||||
error: `error` specified multiple times
|
||||
--> $DIR/session-derive-errors.rs:52:11
|
||||
@ -37,7 +32,7 @@ error: `code` not specified
|
||||
--> $DIR/session-derive-errors.rs:67:1
|
||||
|
|
||||
LL | struct ErrorCodeNotProvided {}
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^^^^^^
|
||||
|
|
||||
= 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
|
||||
|
|
||||
LL | #[message = "this message is applied to a String field"]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^
|
||||
|
||||
error: `name` doesn't refer to a field on this type
|
||||
--> $DIR/session-derive-errors.rs:102:1
|
||||
|
|
||||
LL | #[message = "This error has a field, and references {name}"]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^
|
||||
|
||||
error: invalid format string: expected `'}'` but string was terminated
|
||||
--> $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
|
||||
|
|
||||
LL | #[label = "See here"]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^
|
||||
|
||||
error: `nonsense` is not a valid key for `#[suggestion(...)]`
|
||||
--> $DIR/session-derive-errors.rs:163:18
|
||||
|
|
||||
LL | #[suggestion(nonsense = "This is nonsense")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^^^^^^^^
|
||||
|
||||
error: `msg` is not a valid key for `#[suggestion(...)]`
|
||||
--> $DIR/session-derive-errors.rs:171:18
|
||||
|
|
||||
LL | #[suggestion(msg = "This is a suggestion")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^^^
|
||||
|
||||
error: missing suggestion message
|
||||
--> $DIR/session-derive-errors.rs:179:7
|
||||
|
|
||||
LL | #[suggestion(code = "This is suggested code")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^^^^^^^^^^
|
||||
|
|
||||
= help: provide a suggestion message using #[suggestion(message = "...")]
|
||||
|
||||
error: wrong field type for suggestion
|
||||
--> $DIR/session-derive-errors.rs:194:5
|
||||
|
|
||||
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||
LL | |
|
||||
LL | | suggestion: Applicability,
|
||||
| |_____________________________^
|
||||
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||
| ^
|
||||
|
|
||||
= 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
|
||||
--> $DIR/session-derive-errors.rs:209:5
|
||||
|
|
||||
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||
LL | |
|
||||
LL | | suggestion: (Span, Span, Applicability),
|
||||
| |___________________________________________^
|
||||
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||
| ^
|
||||
|
||||
error: type of field annotated with `#[suggestion(...)]` contains more than one Applicability
|
||||
--> $DIR/session-derive-errors.rs:217:5
|
||||
|
|
||||
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||
LL | |
|
||||
LL | | suggestion: (Applicability, Applicability, Span),
|
||||
| |____________________________________________________^
|
||||
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
|
||||
| ^
|
||||
|
||||
error: invalid annotation list `#[label(...)]`
|
||||
--> $DIR/session-derive-errors.rs:225:7
|
||||
|
|
||||
LL | #[label("wrong kind of annotation for label")]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
| ^^^^^
|
||||
|
||||
error: aborting due to 18 previous errors
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user