Skip to content

Commit 21dea46

Browse files
borsbors
committedNov 18, 2020
Auto merge of #79162 - pietroalbini:beta-next, r=pietroalbini
Actually 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 This is the same as #79132, but actually targeting the right branch. r? `@ghost` cc `@rust-lang/release`
2 parents a38f8fb + 7477867 commit 21dea46

File tree

9 files changed

+222
-52
lines changed

9 files changed

+222
-52
lines changed
 

‎RELEASES.md

+141
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,143 @@
1+
Version 1.48.0 (2020-11-19)
2+
==========================
3+
4+
Language
5+
--------
6+
7+
- [The `unsafe` keyword is now syntactically permitted on modules.][75857] This
8+
is still rejected *semantically*, but can now be parsed by procedural macros.
9+
10+
Compiler
11+
--------
12+
- [Stabilised the `-C link-self-contained=<yes|no>` compiler flag.][76158] This tells
13+
`rustc` whether to link its own C runtime and libraries or to rely on a external
14+
linker to find them. (Supported only on `windows-gnu`, `linux-musl`, and `wasi` platforms.)
15+
- [You can now use `-C target-feature=+crt-static` on `linux-gnu` targets.][77386]
16+
Note: If you're using cargo you must explicitly pass the `--target` flag.
17+
- [Added tier 2\* support for `aarch64-unknown-linux-musl`.][76420]
18+
19+
\* Refer to Rust's [platform support page][forge-platform-support] for more
20+
information on Rust's tiered platform support.
21+
22+
Libraries
23+
---------
24+
- [`io::Write` is now implemented for `&ChildStdin` `&Sink`, `&Stdout`,
25+
and `&Stderr`.][76275]
26+
- [All arrays of any length now implement `TryFrom<Vec<T>>`.][76310]
27+
- [The `matches!` macro now supports having a trailing comma.][74880]
28+
- [`Vec<A>` now implements `PartialEq<[B]>` where `A: PartialEq<B>`.][74194]
29+
- [The `RefCell::{replace, replace_with, clone}` methods now all use `#[track_caller]`.][77055]
30+
31+
Stabilized APIs
32+
---------------
33+
- [`slice::as_ptr_range`]
34+
- [`slice::as_mut_ptr_range`]
35+
- [`VecDeque::make_contiguous`]
36+
- [`future::pending`]
37+
- [`future::ready`]
38+
39+
The following previously stable methods are now `const fn`'s:
40+
41+
- [`Option::is_some`]
42+
- [`Option::is_none`]
43+
- [`Option::as_ref`]
44+
- [`Result::is_ok`]
45+
- [`Result::is_err`]
46+
- [`Result::as_ref`]
47+
- [`Ordering::reverse`]
48+
- [`Ordering::then`]
49+
50+
Cargo
51+
-----
52+
53+
Rustdoc
54+
-------
55+
- [You can now link to items in `rustdoc` using the intra-doc link
56+
syntax.][74430] E.g. ``/// Uses [`std::future`]`` will automatically generate
57+
a link to `std::future`'s documentation. See ["Linking to items by
58+
name"][intradoc-links] for more information.
59+
- [You can now specify `#[doc(alias = "<alias>")]` on items to add search aliases
60+
when searching through `rustdoc`'s UI.][75740]
61+
62+
Compatibility Notes
63+
-------------------
64+
- [Promotion of references to `'static` lifetime inside `const fn` now follows the
65+
same rules as inside a `fn` body.][75502] In particular, `&foo()` will not be
66+
promoted to `'static` lifetime any more inside `const fn`s.
67+
- [Associated type bindings on trait objects are now verified to meet the bounds
68+
declared on the trait when checking that they implement the trait.][27675]
69+
- [When trait bounds on associated types or opaque types are ambiguous, the
70+
compiler no longer makes an arbitrary choice on which bound to use.][54121]
71+
- [Fixed recursive nonterminals not being expanded in macros during
72+
pretty-print/reparse check.][77153] This may cause errors if your macro wasn't
73+
correctly handling recursive nonterminal tokens.
74+
- [`&mut` references to non zero-sized types are no longer promoted.][75585]
75+
- [`rustc` will now warn if you use attributes like `#[link_name]` or `#[cold]`
76+
in places where they have no effect.][73461]
77+
- [Updated `_mm256_extract_epi8` and `_mm256_extract_epi16` signatures in
78+
`arch::{x86, x86_64}` to return `i32` to match the vendor signatures.][73166]
79+
- [`mem::uninitialized` will now panic if any inner types inside a struct or enum
80+
disallow zero-initialization.][71274]
81+
- [`#[target_feature]` will now error if used in a place where it has no effect.][78143]
82+
- [Foreign exceptions are now caught by `catch_unwind` and will cause an abort.][70212]
83+
Note: This behaviour is not guaranteed and is still considered undefined behaviour,
84+
see the [`catch_unwind`] documentation for further information.
85+
86+
87+
88+
Internal Only
89+
-------------
90+
These changes provide no direct user facing benefits, but represent significant
91+
improvements to the internals and overall performance of rustc and
92+
related tools.
93+
94+
- [Building `rustc` from source now uses `ninja` by default over `make`.][74922]
95+
You can continue building with `make` by setting `ninja=false` in
96+
your `config.toml`.
97+
- [cg_llvm: `fewer_names` in `uncached_llvm_type`][76030]
98+
- [Made `ensure_sufficient_stack()` non-generic][76680]
99+
100+
[78143]: https://github.com/rust-lang/rust/issues/78143
101+
[76680]: https://github.com/rust-lang/rust/pull/76680/
102+
[76030]: https://github.com/rust-lang/rust/pull/76030/
103+
[70212]: https://github.com/rust-lang/rust/pull/70212/
104+
[27675]: https://github.com/rust-lang/rust/issues/27675/
105+
[54121]: https://github.com/rust-lang/rust/issues/54121/
106+
[71274]: https://github.com/rust-lang/rust/pull/71274/
107+
[77386]: https://github.com/rust-lang/rust/pull/77386/
108+
[77153]: https://github.com/rust-lang/rust/pull/77153/
109+
[77055]: https://github.com/rust-lang/rust/pull/77055/
110+
[76275]: https://github.com/rust-lang/rust/pull/76275/
111+
[76310]: https://github.com/rust-lang/rust/pull/76310/
112+
[76420]: https://github.com/rust-lang/rust/pull/76420/
113+
[76158]: https://github.com/rust-lang/rust/pull/76158/
114+
[75857]: https://github.com/rust-lang/rust/pull/75857/
115+
[75585]: https://github.com/rust-lang/rust/pull/75585/
116+
[75740]: https://github.com/rust-lang/rust/pull/75740/
117+
[75502]: https://github.com/rust-lang/rust/pull/75502/
118+
[74880]: https://github.com/rust-lang/rust/pull/74880/
119+
[74922]: https://github.com/rust-lang/rust/pull/74922/
120+
[74430]: https://github.com/rust-lang/rust/pull/74430/
121+
[74194]: https://github.com/rust-lang/rust/pull/74194/
122+
[73461]: https://github.com/rust-lang/rust/pull/73461/
123+
[73166]: https://github.com/rust-lang/rust/pull/73166/
124+
[intradoc-links]: https://doc.rust-lang.org/rustdoc/linking-to-items-by-name.html
125+
[`catch_unwind`]: https://doc.rust-lang.org/std/panic/fn.catch_unwind.html
126+
[`Option::is_some`]: https://doc.rust-lang.org/std/option/enum.Option.html#method.is_some
127+
[`Option::is_none`]: https://doc.rust-lang.org/std/option/enum.Option.html#method.is_none
128+
[`Option::as_ref`]: https://doc.rust-lang.org/std/option/enum.Option.html#method.as_ref
129+
[`Result::is_ok`]: https://doc.rust-lang.org/std/result/enum.Result.html#method.is_ok
130+
[`Result::is_err`]: https://doc.rust-lang.org/std/result/enum.Result.html#method.is_err
131+
[`Result::as_ref`]: https://doc.rust-lang.org/std/result/enum.Result.html#method.as_ref
132+
[`Ordering::reverse`]: https://doc.rust-lang.org/std/cmp/enum.Ordering.html#method.reverse
133+
[`Ordering::then`]: https://doc.rust-lang.org/std/cmp/enum.Ordering.html#method.then
134+
[`slice::as_ptr_range`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_ptr_range
135+
[`slice::as_mut_ptr_range`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_mut_ptr_range
136+
[`VecDeque::make_contiguous`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.make_contiguous
137+
[`future::pending`]: https://doc.rust-lang.org/std/future/fn.pending.html
138+
[`future::ready`]: https://doc.rust-lang.org/std/future/fn.ready.html
139+
140+
1141
Version 1.47.0 (2020-10-08)
2142
==========================
3143

@@ -90,6 +230,7 @@ Compatibility Notes
90230

91231
Internal Only
92232
--------
233+
93234
- [Improved default settings for bootstrapping in `x.py`.][73964] You can read details about this change in the ["Changes to `x.py` defaults"](https://blog.rust-lang.org/inside-rust/2020/08/30/changes-to-x-py-defaults.html) post on the Inside Rust blog.
94235

95236
[1.47.0-cfg]: https://docs.microsoft.com/en-us/windows/win32/secbp/control-flow-guard

‎src/bootstrap/dist.rs

+26-1
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,13 @@ impl Step for Rls {
13361336
let rls = builder
13371337
.ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
13381338
.or_else(|| {
1339-
missing_tool("RLS", builder.build.config.missing_tools);
1339+
// We ignore failure on aarch64 Windows because RLS currently
1340+
// fails to build, due to winapi 0.2 not supporting aarch64.
1341+
missing_tool(
1342+
"RLS",
1343+
builder.build.config.missing_tools
1344+
|| (target.triple.contains("aarch64") && target.triple.contains("windows")),
1345+
);
13401346
None
13411347
})?;
13421348

@@ -2357,6 +2363,25 @@ fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir
23572363
return;
23582364
}
23592365

2366+
if let Some(config) = builder.config.target_config.get(&target) {
2367+
if config.llvm_config.is_some() && !builder.config.llvm_from_ci {
2368+
// If the LLVM was externally provided, then we don't currently copy
2369+
// artifacts into the sysroot. This is not necessarily the right
2370+
// choice (in particular, it will require the LLVM dylib to be in
2371+
// the linker's load path at runtime), but the common use case for
2372+
// external LLVMs is distribution provided LLVMs, and in that case
2373+
// they're usually in the standard search path (e.g., /usr/lib) and
2374+
// copying them here is going to cause problems as we may end up
2375+
// with the wrong files and isn't what distributions want.
2376+
//
2377+
// This behavior may be revisited in the future though.
2378+
//
2379+
// If the LLVM is coming from ourselves (just from CI) though, we
2380+
// still want to install it, as it otherwise won't be available.
2381+
return;
2382+
}
2383+
}
2384+
23602385
// On macOS, rustc (and LLVM tools) link to an unversioned libLLVM.dylib
23612386
// instead of libLLVM-11-rust-....dylib, as on linux. It's not entirely
23622387
// clear why this is the case, though. llvm-config will emit the versioned

‎src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363
#
6464
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
6565
# either automatically or manually.
66-
export RUST_RELEASE_CHANNEL=nightly
66+
export RUST_RELEASE_CHANNEL=beta
6767

6868
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
6969
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting

‎src/librustdoc/html/highlight.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ fn write_header(out: &mut String, class: Option<&str>) {
4646
}
4747

4848
fn write_code(out: &mut String, src: &str) {
49-
Classifier::new(src).highlight(&mut |highlight| {
49+
// This replace allows to fix how the code source with DOS backline characters is displayed.
50+
let src = src.replace("\r\n", "\n");
51+
Classifier::new(&src).highlight(&mut |highlight| {
5052
match highlight {
5153
Highlight::Token { text, class } => string(out, Escape(text), class),
5254
Highlight::EnterSpan { class } => enter_span(out, class),

‎src/librustdoc/html/highlight/fixtures/dos_line.html

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">foo</span>() {
2+
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot;foo&quot;</span>);
3+
}

‎src/librustdoc/html/highlight/tests.rs

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
use super::write_code;
22
use expect_test::expect_file;
33

4-
#[test]
5-
fn test_html_highlighting() {
6-
let src = include_str!("fixtures/sample.rs");
7-
let html = {
8-
let mut out = String::new();
9-
write_code(&mut out, src);
10-
format!("{}<pre><code>{}</code></pre>\n", STYLE, out)
11-
};
12-
expect_file!["fixtures/sample.html"].assert_eq(&html);
13-
}
14-
154
const STYLE: &str = r#"
165
<style>
176
.kw { color: #8959A8; }
@@ -23,3 +12,24 @@ const STYLE: &str = r#"
2312
.question-mark { color: #ff9011; }
2413
</style>
2514
"#;
15+
16+
#[test]
17+
fn test_html_highlighting() {
18+
let src = include_str!("fixtures/sample.rs");
19+
let html = {
20+
let mut out = String::new();
21+
write_code(&mut out, src);
22+
format!("{}<pre><code>{}</code></pre>\n", STYLE, out)
23+
};
24+
expect_file!["fixtures/sample.html"].assert_eq(&html);
25+
}
26+
27+
#[test]
28+
fn test_dos_backline() {
29+
let src = "pub fn foo() {\r\n\
30+
println!(\"foo\");\r\n\
31+
}\r\n";
32+
let mut html = String::new();
33+
write_code(&mut html, src);
34+
expect_file!["fixtures/dos_line.html"].assert_eq(&html);
35+
}

‎src/stage0.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.(x+1).0` for Cargo where they were released on `date`.
1414

15-
date: 2020-10-16
16-
rustc: beta
17-
cargo: beta
15+
date: 2020-11-16
16+
rustc: 1.48.0
17+
cargo: 1.48.0
1818

1919
# We use a nightly rustfmt to format the source because it solves some
2020
# bootstrapping issues with use of new syntax in this repo. If you're looking at
2121
# the beta/stable branch, this key should be omitted, as we don't want to depend
2222
# on rustfmt from nightly there.
23-
rustfmt: nightly-2020-10-12
23+
#rustfmt: nightly-2020-10-12
2424

2525
# When making a stable release the process currently looks like:
2626
#
@@ -40,4 +40,4 @@ rustfmt: nightly-2020-10-12
4040
# looking at a beta source tarball and it's uncommented we'll shortly comment it
4141
# out.
4242

43-
#dev: 1
43+
dev: 1

‎src/test/ui-fulldeps/session-derive-errors.stderr

+18-29
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
error: `#[derive(SessionDiagnostic)]` can only be used on structs
22
--> $DIR/session-derive-errors.rs:28:1
33
|
4-
LL | / #[error = "E0123"]
5-
LL | |
6-
LL | | enum SessionDiagnosticOnEnum {
7-
LL | | Foo,
8-
LL | | Bar,
9-
LL | | }
10-
| |_^
4+
LL | #[error = "E0123"]
5+
| ^
116

127
error: `#[label = ...]` is not a valid SessionDiagnostic struct attribute
138
--> $DIR/session-derive-errors.rs:37:1
149
|
1510
LL | #[label = "This is in the wrong place"]
16-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
11+
| ^
1712

1813
error: `#[suggestion = ...]` is not a valid SessionDiagnostic field attribute
1914
--> $DIR/session-derive-errors.rs:44:5
2015
|
2116
LL | #[suggestion = "this is the wrong kind of attribute"]
22-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
17+
| ^
2318

2419
error: `error` specified multiple times
2520
--> $DIR/session-derive-errors.rs:52:11
@@ -37,21 +32,21 @@ error: `code` not specified
3732
--> $DIR/session-derive-errors.rs:67:1
3833
|
3934
LL | struct ErrorCodeNotProvided {}
40-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
35+
| ^^^^^^
4136
|
4237
= help: use the [code = "..."] attribute to set this diagnostic's error code
4338

4439
error: the `#[message = "..."]` attribute can only be applied to fields of type Span
4540
--> $DIR/session-derive-errors.rs:95:5
4641
|
4742
LL | #[message = "this message is applied to a String field"]
48-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
43+
| ^
4944

5045
error: `name` doesn't refer to a field on this type
5146
--> $DIR/session-derive-errors.rs:102:1
5247
|
5348
LL | #[message = "This error has a field, and references {name}"]
54-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
49+
| ^
5550

5651
error: invalid format string: expected `'}'` but string was terminated
5752
--> $DIR/session-derive-errors.rs:110:1
@@ -77,59 +72,53 @@ error: The `#[label = ...]` attribute can only be applied to fields of type Span
7772
--> $DIR/session-derive-errors.rs:138:5
7873
|
7974
LL | #[label = "See here"]
80-
| ^^^^^^^^^^^^^^^^^^^^^
75+
| ^
8176

8277
error: `nonsense` is not a valid key for `#[suggestion(...)]`
8378
--> $DIR/session-derive-errors.rs:163:18
8479
|
8580
LL | #[suggestion(nonsense = "This is nonsense")]
86-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
81+
| ^^^^^^^^
8782

8883
error: `msg` is not a valid key for `#[suggestion(...)]`
8984
--> $DIR/session-derive-errors.rs:171:18
9085
|
9186
LL | #[suggestion(msg = "This is a suggestion")]
92-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
87+
| ^^^
9388

9489
error: missing suggestion message
9590
--> $DIR/session-derive-errors.rs:179:7
9691
|
9792
LL | #[suggestion(code = "This is suggested code")]
98-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
93+
| ^^^^^^^^^^
9994
|
10095
= help: provide a suggestion message using #[suggestion(message = "...")]
10196

10297
error: wrong field type for suggestion
10398
--> $DIR/session-derive-errors.rs:194:5
10499
|
105-
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
106-
LL | |
107-
LL | | suggestion: Applicability,
108-
| |_____________________________^
100+
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
101+
| ^
109102
|
110103
= help: #[suggestion(...)] should be applied to fields of type Span or (Span, Applicability)
111104

112105
error: type of field annotated with `#[suggestion(...)]` contains more than one Span
113106
--> $DIR/session-derive-errors.rs:209:5
114107
|
115-
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
116-
LL | |
117-
LL | | suggestion: (Span, Span, Applicability),
118-
| |___________________________________________^
108+
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
109+
| ^
119110

120111
error: type of field annotated with `#[suggestion(...)]` contains more than one Applicability
121112
--> $DIR/session-derive-errors.rs:217:5
122113
|
123-
LL | / #[suggestion(message = "This is a message", code = "This is suggested code")]
124-
LL | |
125-
LL | | suggestion: (Applicability, Applicability, Span),
126-
| |____________________________________________________^
114+
LL | #[suggestion(message = "This is a message", code = "This is suggested code")]
115+
| ^
127116

128117
error: invalid annotation list `#[label(...)]`
129118
--> $DIR/session-derive-errors.rs:225:7
130119
|
131120
LL | #[label("wrong kind of annotation for label")]
132-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
121+
| ^^^^^
133122

134123
error: aborting due to 18 previous errors
135124

‎src/tools/build-manifest/src/versions.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use std::path::{Path, PathBuf};
77
use tar::Archive;
88

99
const DEFAULT_TARGET: &str = "x86_64-unknown-linux-gnu";
10-
const RUSTC_VERSION: &str = include_str!("../../../version");
1110

1211
#[derive(Debug, Hash, Eq, PartialEq, Clone)]
1312
pub(crate) enum PkgType {
@@ -177,10 +176,10 @@ impl Versions {
177176
) -> Result<String, Error> {
178177
let component_name = package.tarball_component_name();
179178
let version = match self.channel.as_str() {
180-
"stable" => RUSTC_VERSION.into(),
179+
"stable" => self.rustc_version().into(),
181180
"beta" => "beta".into(),
182181
"nightly" => "nightly".into(),
183-
_ => format!("{}-dev", RUSTC_VERSION),
182+
_ => format!("{}-dev", self.rustc_version()),
184183
};
185184

186185
if package.target_independent() {
@@ -199,6 +198,7 @@ impl Versions {
199198
}
200199

201200
pub(crate) fn rustc_version(&self) -> &str {
202-
RUSTC_VERSION
201+
const RUSTC_VERSION: &str = include_str!("../../../version");
202+
RUSTC_VERSION.trim()
203203
}
204204
}

0 commit comments

Comments
 (0)
Please sign in to comment.