Skip to content

Commit 777a59a

Browse files
borsbors
committed
Auto merge of #55184 - pietroalbini:beta-backports, r=pietroalbini
[beta] Rollup backports Merged and approved: * #54300: Updated RELEASES.md for 1.30.0 * #54939: rustdoc: don't prefer dynamic linking in doc tests * #54671: resolve: Scale back hard-coded extern prelude additions on 2015 edition * #55102: resolve: Do not skip extern prelude during speculative resolution r? @ghost
2 parents 5901219 + b2e0bee commit 777a59a

File tree

16 files changed

+188
-33
lines changed

16 files changed

+188
-33
lines changed

Diff for: ‎RELEASES.md

+126
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,124 @@
1+
Version 1.30.0 (2018-10-25)
2+
==========================
3+
4+
Language
5+
--------
6+
- [Procedural macros are now available.][52081] These kinds of macros allow for
7+
more powerful code generation, there is a [new chapter available][proc-macros]
8+
in Rust Programming Language book that goes further in depth.
9+
- [You can now use keywords as identifiers using the raw identifiers
10+
syntax (`r#`).][53236] e.g. `let r#bool = true;`
11+
- [Using anonymous parameters in traits is now deprecated with a warning and
12+
will be a hard error in the 2018 edition.][53272]
13+
- [You can now use `crate` in paths.][54404] This allows you to refer to the
14+
crate root in the path. e.g. `use crate::foo;` refers to `foo` in `src/lib.rs`.
15+
- [Using a external crate now no longer requires being prefixed with `::`.][54404]
16+
e.g. previously using a external crate in a module without a use statement
17+
required `let json = ::serde_json::from_str(foo);` can now be written
18+
as `let json = serde_json::from_str(foo);`.
19+
- [You can now apply the `#[used]` attribute to static items to prevent the
20+
compiler from optimising them away even if they appear to be unused.][51363]
21+
e.g. `#[used] static FOO: u32 = 1;`
22+
- [You can now import and reexport macros from other crates with the `use`
23+
syntax.][50911] Macros exported with `#[macro_export]` are now placed into
24+
the root module of the crate. If your macro relies on calling other local
25+
macros it is recommended to export with the
26+
`#[macro_export(local_inner_macros)]` attribute so that users won't have to
27+
import those macros.
28+
- [`mod.rs` files are now optional.][54146] Previously if you had a `foo` module
29+
with a `bar` submodule, you would have `src/foo/mod.rs` and `src/foo/bar.rs`.
30+
Now you can have `src/foo.rs` and `src/foo/bar.rs` to achieve the same effect.
31+
- [You can now catch visibility keywords (e.g. `pub`, `pub(crate)`) in macros
32+
using the `vis` specifier.][53370]
33+
- [Non-macro attributes now allow all forms of literals not just
34+
strings.][53044] e.g. Previously you would write `#[attr("true")]` you can now
35+
write `#[attr(true)]`.
36+
- [You can now specify a function to handle a panic in the Rust runtime with the
37+
`#[panic_handler]` attribute.][51366]
38+
39+
Compiler
40+
--------
41+
- [Added the `riscv32imc-unknown-none-elf` target.][53822]
42+
- [Added the `aarch64-unknown-netbsd` target][53165]
43+
44+
Libraries
45+
---------
46+
- [`ManuallyDrop` now allows the inner type to be unsized.][53033]
47+
48+
Stabilized APIs
49+
---------------
50+
- [`Ipv4Addr::BROADCAST`]
51+
- [`Ipv4Addr::LOCALHOST`]
52+
- [`Ipv4Addr::UNSPECIFIED`]
53+
- [`Ipv6Addr::LOCALHOST`]
54+
- [`Ipv6Addr::UNSPECIFIED`]
55+
- [`Iterator::find_map`]
56+
57+
The following methods are a replacement methods for `trim_left`, `trim_right`,
58+
`trim_left_matches`, and `trim_right_matches`. Which will be deprecated
59+
in 1.33.0.
60+
- [`str::trim_end_matches`]
61+
- [`str::trim_end`]
62+
- [`str::trim_start_matches`]
63+
- [`str::trim_start`]
64+
65+
Cargo
66+
----
67+
- [`cargo run` doesn't require specifying a package in workspaces.][cargo/5877]
68+
- [`cargo doc` now supports `--message-format=json`.][cargo/5878] This is
69+
equivalent to calling `rustdoc --error-format=json`.
70+
- [You can specify which edition to create a project in cargo
71+
with `cargo new --edition`.][cargo/5984] Currently only `2015` is a
72+
valid option.
73+
- [Cargo will now provide a progress bar for builds.][cargo/5995]
74+
75+
Misc
76+
----
77+
- [`rustdoc` allows you to specify what edition to treat your code as with the
78+
`--edition` option.][54057]
79+
- [`rustdoc` now has the `--color` (Specify whether to output color) and
80+
`--error-format` (Specify error format e.g. `json`) options.][53003]
81+
- [We now distribute a `rust-gdbgui` script that invokes `gdbgui` with Rust
82+
debug symbols.][53774]
83+
- [Attributes from Rust tools such as `rustfmt` or `clippy` are now
84+
available.][53459] e.g. `#[rustfmt::skip]` will skip formatting the next item.
85+
86+
[50911]: https://github.com/rust-lang/rust/pull/50911/
87+
[51363]: https://github.com/rust-lang/rust/pull/51363/
88+
[51366]: https://github.com/rust-lang/rust/pull/51366/
89+
[52081]: https://github.com/rust-lang/rust/pull/52081/
90+
[53003]: https://github.com/rust-lang/rust/pull/53003/
91+
[53033]: https://github.com/rust-lang/rust/pull/53033/
92+
[53044]: https://github.com/rust-lang/rust/pull/53044/
93+
[53165]: https://github.com/rust-lang/rust/pull/53165/
94+
[53213]: https://github.com/rust-lang/rust/pull/53213/
95+
[53236]: https://github.com/rust-lang/rust/pull/53236/
96+
[53272]: https://github.com/rust-lang/rust/pull/53272/
97+
[53370]: https://github.com/rust-lang/rust/pull/53370/
98+
[53459]: https://github.com/rust-lang/rust/pull/53459/
99+
[53774]: https://github.com/rust-lang/rust/pull/53774/
100+
[53822]: https://github.com/rust-lang/rust/pull/53822/
101+
[54057]: https://github.com/rust-lang/rust/pull/54057/
102+
[54146]: https://github.com/rust-lang/rust/pull/54146/
103+
[54404]: https://github.com/rust-lang/rust/pull/54404/
104+
[cargo/5877]: https://github.com/rust-lang/cargo/pull/5877/
105+
[cargo/5878]: https://github.com/rust-lang/cargo/pull/5878/
106+
[cargo/5984]: https://github.com/rust-lang/cargo/pull/5984/
107+
[cargo/5995]: https://github.com/rust-lang/cargo/pull/5995/
108+
[proc-macros]: https://doc.rust-lang.org/book/2018-edition/ch19-06-macros.html
109+
110+
[`Ipv4Addr::BROADCAST`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv4Addr.html#associatedconstant.BROADCAST
111+
[`Ipv4Addr::LOCALHOST`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv4Addr.html#associatedconstant.LOCALHOST
112+
[`Ipv4Addr::UNSPECIFIED`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv4Addr.html#associatedconstant.UNSPECIFIED
113+
[`Ipv6Addr::LOCALHOST`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv6Addr.html#associatedconstant.LOCALHOST
114+
[`Ipv6Addr::UNSPECIFIED`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv6Addr.html#associatedconstant.UNSPECIFIED
115+
[`Iterator::find_map`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.find_map
116+
[`str::trim_end_matches`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.trim_end_matches
117+
[`str::trim_end`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.trim_end
118+
[`str::trim_start_matches`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.trim_start_matches
119+
[`str::trim_start`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.trim_start
120+
121+
1122
Version 1.29.2 (2018-10-11)
2123
===========================
3124

@@ -6,6 +127,7 @@ Version 1.29.2 (2018-10-11)
6127

7128
[54639]: https://github.com/rust-lang/rust/pull/54639
8129

130+
9131
Version 1.29.1 (2018-09-25)
10132
===========================
11133

@@ -19,6 +141,7 @@ Security Notes
19141
Thank you to Scott McMurray for responsibily disclosing this vulnerability to
20142
us.
21143

144+
22145
Version 1.29.0 (2018-09-13)
23146
==========================
24147

@@ -73,7 +196,10 @@ Compatibility Notes
73196
Consider using the `home_dir` function from
74197
https://crates.io/crates/dirs instead.
75198
- [`rustc` will no longer silently ignore invalid data in target spec.][52330]
199+
- [`cfg` attributes and `--cfg` command line flags are now more
200+
strictly validated.][53893]
76201

202+
[53893]: https://github.com/rust-lang/rust/pull/53893/
77203
[52861]: https://github.com/rust-lang/rust/pull/52861/
78204
[52656]: https://github.com/rust-lang/rust/pull/52656/
79205
[52239]: https://github.com/rust-lang/rust/pull/52239/

Diff for: ‎src/librustc/session/mod.rs

+1-17
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use syntax::parse;
3737
use syntax::parse::ParseSess;
3838
use syntax::{ast, source_map};
3939
use syntax::feature_gate::AttributeType;
40-
use syntax_pos::{MultiSpan, Span, symbol::Symbol};
40+
use syntax_pos::{MultiSpan, Span};
4141
use util::profiling::SelfProfiler;
4242

4343
use rustc_target::spec::PanicStrategy;
@@ -164,10 +164,6 @@ pub struct Session {
164164

165165
/// Cap lint level specified by a driver specifically.
166166
pub driver_lint_caps: FxHashMap<lint::LintId, lint::Level>,
167-
168-
/// All the crate names specified with `--extern`, and the builtin ones.
169-
/// Starting with the Rust 2018 edition, absolute paths resolve in this set.
170-
pub extern_prelude: FxHashSet<Symbol>,
171167
}
172168

173169
pub struct PerfStats {
@@ -1113,17 +1109,6 @@ pub fn build_session_(
11131109
};
11141110
let working_dir = file_path_mapping.map_prefix(working_dir);
11151111

1116-
let mut extern_prelude: FxHashSet<Symbol> =
1117-
sopts.externs.iter().map(|kv| Symbol::intern(kv.0)).collect();
1118-
1119-
// HACK(eddyb) this ignores the `no_{core,std}` attributes.
1120-
// FIXME(eddyb) warn (somewhere) if core/std is used with `no_{core,std}`.
1121-
// if !attr::contains_name(&krate.attrs, "no_core") {
1122-
// if !attr::contains_name(&krate.attrs, "no_std") {
1123-
extern_prelude.insert(Symbol::intern("core"));
1124-
extern_prelude.insert(Symbol::intern("std"));
1125-
extern_prelude.insert(Symbol::intern("meta"));
1126-
11271112
let sess = Session {
11281113
target: target_cfg,
11291114
host,
@@ -1198,7 +1183,6 @@ pub fn build_session_(
11981183
has_global_allocator: Once::new(),
11991184
has_panic_handler: Once::new(),
12001185
driver_lint_caps: FxHashMap(),
1201-
extern_prelude,
12021186
};
12031187

12041188
validate_commandline_args_with_session_available(&sess);

Diff for: ‎src/librustc/ty/context.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,8 @@ pub struct GlobalCtxt<'tcx> {
927927
freevars: FxHashMap<DefId, Lrc<Vec<hir::Freevar>>>,
928928

929929
maybe_unused_trait_imports: FxHashSet<DefId>,
930-
931930
maybe_unused_extern_crates: Vec<(DefId, Span)>,
931+
pub extern_prelude: FxHashSet<ast::Name>,
932932

933933
// Internal cache for metadata decoding. No need to track deps on this.
934934
pub rcache: Lock<FxHashMap<ty::CReaderCacheKey, Ty<'tcx>>>,
@@ -1245,6 +1245,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
12451245
.into_iter()
12461246
.map(|(id, sp)| (hir.local_def_id(id), sp))
12471247
.collect(),
1248+
extern_prelude: resolutions.extern_prelude,
12481249
hir,
12491250
def_path_hash_to_def_id,
12501251
queries: query::Queries::new(

Diff for: ‎src/librustc/ty/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use ty::subst::{Subst, Substs};
3636
use ty::util::{IntTypeExt, Discr};
3737
use ty::walk::TypeWalker;
3838
use util::captures::Captures;
39-
use util::nodemap::{NodeSet, DefIdMap, FxHashMap};
39+
use util::nodemap::{NodeSet, DefIdMap, FxHashMap, FxHashSet};
4040
use arena::SyncDroplessArena;
4141
use session::DataTypeKind;
4242

@@ -139,6 +139,7 @@ pub struct Resolutions {
139139
pub maybe_unused_trait_imports: NodeSet,
140140
pub maybe_unused_extern_crates: Vec<(NodeId, Span)>,
141141
pub export_map: ExportMap,
142+
pub extern_prelude: FxHashSet<Name>,
142143
}
143144

144145
#[derive(Clone, Copy, PartialEq, Eq, Debug)]

Diff for: ‎src/librustc_driver/driver.rs

+1
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,7 @@ where
790790
trait_map: resolver.trait_map,
791791
maybe_unused_trait_imports: resolver.maybe_unused_trait_imports,
792792
maybe_unused_extern_crates: resolver.maybe_unused_extern_crates,
793+
extern_prelude: resolver.extern_prelude,
793794
},
794795

795796
analysis: ty::CrateAnalysis {

Diff for: ‎src/librustc_resolve/lib.rs

+27-5
Original file line numberDiff line numberDiff line change
@@ -1361,6 +1361,7 @@ pub struct Resolver<'a, 'b: 'a> {
13611361
graph_root: Module<'a>,
13621362

13631363
prelude: Option<Module<'a>>,
1364+
pub extern_prelude: FxHashSet<Name>,
13641365

13651366
/// n.b. This is used only for better diagnostics, not name resolution itself.
13661367
has_self: FxHashSet<DefId>,
@@ -1674,6 +1675,19 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
16741675
DefCollector::new(&mut definitions, Mark::root())
16751676
.collect_root(crate_name, session.local_crate_disambiguator());
16761677

1678+
let mut extern_prelude: FxHashSet<Name> =
1679+
session.opts.externs.iter().map(|kv| Symbol::intern(kv.0)).collect();
1680+
1681+
if !attr::contains_name(&krate.attrs, "no_core") {
1682+
extern_prelude.insert(Symbol::intern("core"));
1683+
if !attr::contains_name(&krate.attrs, "no_std") {
1684+
extern_prelude.insert(Symbol::intern("std"));
1685+
if session.rust_2018() {
1686+
extern_prelude.insert(Symbol::intern("meta"));
1687+
}
1688+
}
1689+
}
1690+
16771691
let mut invocations = FxHashMap();
16781692
invocations.insert(Mark::root(),
16791693
arenas.alloc_invocation_data(InvocationData::root(graph_root)));
@@ -1692,6 +1706,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
16921706
// AST.
16931707
graph_root,
16941708
prelude: None,
1709+
extern_prelude,
16951710

16961711
has_self: FxHashSet(),
16971712
field_names: FxHashMap(),
@@ -1962,9 +1977,15 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
19621977
}
19631978

19641979
if !module.no_implicit_prelude {
1965-
// `record_used` means that we don't try to load crates during speculative resolution
1966-
if record_used && ns == TypeNS && self.session.extern_prelude.contains(&ident.name) {
1967-
let crate_id = self.crate_loader.process_path_extern(ident.name, ident.span);
1980+
if ns == TypeNS && self.extern_prelude.contains(&ident.name) {
1981+
let crate_id = if record_used {
1982+
self.crate_loader.process_path_extern(ident.name, ident.span)
1983+
} else if let Some(crate_id) =
1984+
self.crate_loader.maybe_process_path_extern(ident.name, ident.span) {
1985+
crate_id
1986+
} else {
1987+
return None;
1988+
};
19681989
let crate_root = self.get_module(DefId { krate: crate_id, index: CRATE_DEF_INDEX });
19691990
self.populate_module_if_necessary(&crate_root);
19701991

@@ -3950,7 +3971,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
39503971
} else {
39513972
// Items from the prelude
39523973
if !module.no_implicit_prelude {
3953-
names.extend(self.session.extern_prelude.iter().cloned());
3974+
names.extend(self.extern_prelude.iter().cloned());
39543975
if let Some(prelude) = self.prelude {
39553976
add_module_candidates(prelude, &mut names);
39563977
}
@@ -4396,7 +4417,8 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
43964417
);
43974418

43984419
if self.session.rust_2018() {
4399-
for &name in &self.session.extern_prelude {
4420+
let extern_prelude_names = self.extern_prelude.clone();
4421+
for &name in extern_prelude_names.iter() {
44004422
let ident = Ident::with_empty_ctxt(name);
44014423
match self.crate_loader.maybe_process_path_extern(name, ident.span) {
44024424
Some(crate_id) => {

Diff for: ‎src/librustc_resolve/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ impl<'a, 'cl> Resolver<'a, 'cl> {
681681
result
682682
}
683683
WhereToResolve::ExternPrelude => {
684-
if use_prelude && self.session.extern_prelude.contains(&ident.name) {
684+
if use_prelude && self.extern_prelude.contains(&ident.name) {
685685
let crate_id =
686686
self.crate_loader.process_path_extern(ident.name, ident.span);
687687
let crate_root =

Diff for: ‎src/librustc_resolve/resolve_imports.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ impl<'a, 'crateloader> Resolver<'a, 'crateloader> {
199199
if !(
200200
ns == TypeNS &&
201201
!ident.is_path_segment_keyword() &&
202-
self.session.extern_prelude.contains(&ident.name)
202+
self.extern_prelude.contains(&ident.name)
203203
) {
204204
// ... unless the crate name is not in the `extern_prelude`.
205205
return binding;
@@ -218,7 +218,7 @@ impl<'a, 'crateloader> Resolver<'a, 'crateloader> {
218218
} else if
219219
ns == TypeNS &&
220220
!ident.is_path_segment_keyword() &&
221-
self.session.extern_prelude.contains(&ident.name)
221+
self.extern_prelude.contains(&ident.name)
222222
{
223223
let crate_id =
224224
self.crate_loader.process_path_extern(ident.name, ident.span);
@@ -736,7 +736,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
736736
let uniform_paths_feature = self.session.features_untracked().uniform_paths;
737737
for ((span, _, ns), results) in uniform_paths_canaries {
738738
let name = results.name;
739-
let external_crate = if ns == TypeNS && self.session.extern_prelude.contains(&name) {
739+
let external_crate = if ns == TypeNS && self.extern_prelude.contains(&name) {
740740
let crate_id =
741741
self.crate_loader.process_path_extern(name, span);
742742
Some(Def::Mod(DefId { krate: crate_id, index: CRATE_DEF_INDEX }))

Diff for: ‎src/librustc_typeck/check_unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ fn unused_crates_lint<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>) {
158158
// If the extern crate isn't in the extern prelude,
159159
// there is no way it can be written as an `use`.
160160
let orig_name = extern_crate.orig_name.unwrap_or(item.name);
161-
if !tcx.sess.extern_prelude.contains(&orig_name) {
161+
if !tcx.extern_prelude.contains(&orig_name) {
162162
continue;
163163
}
164164

Diff for: ‎src/librustdoc/core.rs

+1
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ pub fn run_core(search_paths: SearchPaths,
457457
trait_map: resolver.trait_map.clone(),
458458
maybe_unused_trait_imports: resolver.maybe_unused_trait_imports.clone(),
459459
maybe_unused_extern_crates: resolver.maybe_unused_extern_crates.clone(),
460+
extern_prelude: resolver.extern_prelude.clone(),
460461
};
461462
let analysis = ty::CrateAnalysis {
462463
access_levels: Lrc::new(AccessLevels::default()),

Diff for: ‎src/librustdoc/test.rs

-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
220220
output_types: outputs,
221221
externs,
222222
cg: config::CodegenOptions {
223-
prefer_dynamic: true,
224223
linker,
225224
..cg
226225
},

Diff for: ‎src/test/rustdoc-ui/failed-doctest-output.stdout

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ error[E0425]: cannot find value `no` in this scope
1212
3 | no
1313
| ^^ not found in this scope
1414

15-
thread '$DIR/failed-doctest-output.rs - OtherStruct (line 26)' panicked at 'couldn't compile the test', librustdoc/test.rs:333:13
15+
thread '$DIR/failed-doctest-output.rs - OtherStruct (line 26)' panicked at 'couldn't compile the test', librustdoc/test.rs:332:13
1616
note: Run with `RUST_BACKTRACE=1` for a backtrace.
1717

1818
---- $DIR/failed-doctest-output.rs - SomeStruct (line 20) stdout ----
@@ -21,7 +21,7 @@ thread '$DIR/failed-doctest-output.rs - SomeStruct (line 20)' panicked at 'test
2121
thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1
2222
note: Run with `RUST_BACKTRACE=1` for a backtrace.
2323

24-
', librustdoc/test.rs:368:17
24+
', librustdoc/test.rs:367:17
2525

2626

2727
failures:

Diff for: ‎src/test/ui/impl-trait/auxiliary/extra-item.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub trait MyTrait {}

0 commit comments

Comments
 (0)