Skip to content

Commit 6f839fb

Browse files
borsbors
committed
Auto merge of #56977 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests Successful merges: - #56363 (Defactored Bytes::read) - #56663 (Remove lifetime from Resolver) - #56689 (add a lint group for lints emitted by rustdoc) - #56772 (fix issue 54153 by not testing issue-18804 on Windows nor OS X.) - #56820 (format-related tweaks) - #56881 (Implement Eq, PartialEq and Hash for atomic::Ordering) - #56907 (Fix grammar in compiler error for array iterators) - #56908 (rustc: Don't ICE on usage of two new target features) - #56910 (Do not point at delim spans for complete correct blocks) - #56913 (Enable stack probes for UEFI images) - #56918 (Profiler: simplify total_duration, improve readability) - #56931 (Update release notes for Rust 1.31.1) - #56947 (Add targets thumbv7neon-linux-androideabi and thumbv7neon-unknown-linux-gnueabihf) - #56948 (Update LLVM submodule) - #56959 (Fix mobile menu rendering collision with tooltip.) Failed merges: - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) r? @ghost
2 parents 74ebf02 + 1ba6ec4 commit 6f839fb

Some content is hidden

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

53 files changed

+471
-255
lines changed

‎RELEASES.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 1.31.1 (2018-12-20)
2+
===========================
3+
4+
- [Fix Rust failing to build on `powerpc-unknown-netbsd`][56562]
5+
- [Fix broken go-to-definition in RLS][rls/1171]
6+
- [Fix infinite loop on hover in RLS][rls/1170]
7+
8+
[56562]: https://github.com/rust-lang/rust/pull/56562
9+
[rls/1171]: https://github.com/rust-lang/rls/issues/1171
10+
[rls/1170]: https://github.com/rust-lang/rls/pull/1170
11+
112
Version 1.31.0 (2018-12-06)
213
==========================
314

‎src/bootstrap/cc_detect.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ fn set_compiler(cfg: &mut cc::Build,
143143
// compiler already takes into account the triple in question.
144144
t if t.contains("android") => {
145145
if let Some(ndk) = config.and_then(|c| c.ndk.as_ref()) {
146-
let target = target.replace("armv7", "arm");
146+
let target = target.replace("armv7neon", "arm")
147+
.replace("armv7", "arm")
148+
.replace("thumbv7neon", "arm")
149+
.replace("thumbv7", "arm");
147150
let compiler = format!("{}-{}", target, compiler.clang());
148151
cfg.compiler(ndk.join("bin").join(compiler));
149152
}

‎src/bootstrap/configure.py

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ def v(*args):
107107
"arm-linux-androideabi NDK standalone path")
108108
v("armv7-linux-androideabi-ndk", "target.armv7-linux-androideabi.android-ndk",
109109
"armv7-linux-androideabi NDK standalone path")
110+
v("thumbv7neon-linux-androideabi-ndk", "target.thumbv7neon-linux-androideabi.android-ndk",
111+
"thumbv7neon-linux-androideabi NDK standalone path")
110112
v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
111113
"aarch64-linux-android NDK standalone path")
112114
v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",

‎src/ci/docker/dist-android/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN . /scripts/android-ndk.sh && \
1616
# env
1717
ENV TARGETS=arm-linux-androideabi
1818
ENV TARGETS=$TARGETS,armv7-linux-androideabi
19+
ENV TARGETS=$TARGETS,thumbv7neon-linux-androideabi
1920
ENV TARGETS=$TARGETS,i686-linux-android
2021
ENV TARGETS=$TARGETS,aarch64-linux-android
2122
ENV TARGETS=$TARGETS,x86_64-linux-android
@@ -24,6 +25,7 @@ ENV RUST_CONFIGURE_ARGS \
2425
--enable-extended \
2526
--arm-linux-androideabi-ndk=/android/ndk/arm-14 \
2627
--armv7-linux-androideabi-ndk=/android/ndk/arm-14 \
28+
--thumbv7neon-linux-androideabi-ndk=/android/ndk/arm-14 \
2729
--i686-linux-android-ndk=/android/ndk/x86-14 \
2830
--aarch64-linux-android-ndk=/android/ndk/arm64-21 \
2931
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \

‎src/libcore/iter/iterator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fn _assert_is_object_safe(_: &dyn Iterator<Item=()>) {}
8787
on(
8888
_Self="[]",
8989
label="borrow the array with `&` or call `.iter()` on it to iterate over it",
90-
note="arrays are not an iterators, but slices like the following are: `&[1, 2, 3]`"
90+
note="arrays are not iterators, but slices like the following are: `&[1, 2, 3]`"
9191
),
9292
on(
9393
_Self="{integral}",

‎src/libcore/sync/atomic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ unsafe impl<T> Sync for AtomicPtr<T> {}
188188
/// [Ordering::Relaxed]: #variant.Relaxed
189189
/// [Ordering::SeqCst]: #variant.SeqCst
190190
#[stable(feature = "rust1", since = "1.0.0")]
191-
#[derive(Copy, Clone, Debug)]
191+
#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
192192
#[non_exhaustive]
193193
pub enum Ordering {
194194
/// No ordering constraints, only atomic operations.

‎src/librustc/lint/builtin.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -315,19 +315,19 @@ declare_lint! {
315315
declare_lint! {
316316
pub INTRA_DOC_LINK_RESOLUTION_FAILURE,
317317
Warn,
318-
"warn about documentation intra links resolution failure"
318+
"failures in resolving intra-doc link targets"
319319
}
320320

321321
declare_lint! {
322322
pub MISSING_DOC_CODE_EXAMPLES,
323323
Allow,
324-
"warn about missing code example in an item's documentation"
324+
"detects publicly-exported items without code samples in their documentation"
325325
}
326326

327327
declare_lint! {
328328
pub PRIVATE_DOC_TESTS,
329329
Allow,
330-
"warn about doc test in private item"
330+
"detects code samples in docs of private items not documented by rustdoc"
331331
}
332332

333333
declare_lint! {

‎src/librustc_driver/driver.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -730,9 +730,9 @@ pub struct ExpansionResult {
730730
pub hir_forest: hir_map::Forest,
731731
}
732732

733-
pub struct InnerExpansionResult<'a, 'b: 'a> {
733+
pub struct InnerExpansionResult<'a> {
734734
pub expanded_crate: ast::Crate,
735-
pub resolver: Resolver<'a, 'b>,
735+
pub resolver: Resolver<'a>,
736736
pub hir_forest: hir_map::Forest,
737737
}
738738

@@ -811,7 +811,7 @@ where
811811

812812
/// Same as phase_2_configure_and_expand, but doesn't let you keep the resolver
813813
/// around
814-
pub fn phase_2_configure_and_expand_inner<'a, 'b: 'a, F>(
814+
pub fn phase_2_configure_and_expand_inner<'a, F>(
815815
sess: &'a Session,
816816
cstore: &'a CStore,
817817
mut krate: ast::Crate,
@@ -820,9 +820,9 @@ pub fn phase_2_configure_and_expand_inner<'a, 'b: 'a, F>(
820820
addl_plugins: Option<Vec<String>>,
821821
make_glob_map: MakeGlobMap,
822822
resolver_arenas: &'a ResolverArenas<'a>,
823-
crate_loader: &'a mut CrateLoader<'b>,
823+
crate_loader: &'a mut CrateLoader<'a>,
824824
after_expand: F,
825-
) -> Result<InnerExpansionResult<'a, 'b>, CompileIncomplete>
825+
) -> Result<InnerExpansionResult<'a>, CompileIncomplete>
826826
where
827827
F: FnOnce(&ast::Crate) -> CompileResult,
828828
{

‎src/librustc_driver/profile/mod.rs

+57-62
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ struct StackFrame {
6464
}
6565

6666
fn total_duration(traces: &[trace::Rec]) -> Duration {
67-
let mut sum : Duration = Duration::new(0, 0);
68-
for t in traces.iter() { sum += t.dur_total; }
69-
return sum
67+
Duration::new(0, 0) + traces.iter().map(|t| t.dur_total).sum()
7068
}
7169

7270
// profiling thread; retains state (in local variables) and dump traces, upon request.
@@ -93,50 +91,48 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
9391
ProfileQueriesMsg::Dump(params) => {
9492
assert!(stack.is_empty());
9593
assert!(frame.parse_st == ParseState::Clear);
96-
{
97-
// write log of all messages
98-
if params.dump_profq_msg_log {
99-
let mut log_file =
100-
File::create(format!("{}.log.txt", params.path)).unwrap();
101-
for m in profq_msgs.iter() {
102-
writeln!(&mut log_file, "{:?}", m).unwrap()
103-
};
104-
}
10594

106-
// write HTML file, and counts file
107-
let html_path = format!("{}.html", params.path);
108-
let mut html_file = File::create(&html_path).unwrap();
95+
// write log of all messages
96+
if params.dump_profq_msg_log {
97+
let mut log_file =
98+
File::create(format!("{}.log.txt", params.path)).unwrap();
99+
for m in profq_msgs.iter() {
100+
writeln!(&mut log_file, "{:?}", m).unwrap()
101+
};
102+
}
109103

110-
let counts_path = format!("{}.counts.txt", params.path);
111-
let mut counts_file = File::create(&counts_path).unwrap();
104+
// write HTML file, and counts file
105+
let html_path = format!("{}.html", params.path);
106+
let mut html_file = File::create(&html_path).unwrap();
112107

113-
writeln!(html_file,
114-
"<html>\n<head>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"{}\">",
115-
"profile_queries.css").unwrap();
116-
writeln!(html_file, "<style>").unwrap();
117-
trace::write_style(&mut html_file);
118-
writeln!(html_file, "</style>\n</head>\n<body>").unwrap();
119-
trace::write_traces(&mut html_file, &mut counts_file, &frame.traces);
120-
writeln!(html_file, "</body>\n</html>").unwrap();
108+
let counts_path = format!("{}.counts.txt", params.path);
109+
let mut counts_file = File::create(&counts_path).unwrap();
121110

122-
let ack_path = format!("{}.ack", params.path);
123-
let ack_file = File::create(&ack_path).unwrap();
124-
drop(ack_file);
111+
writeln!(html_file,
112+
"<html>\n<head>\n<link rel=\"stylesheet\" type=\"text/css\" href=\"{}\">",
113+
"profile_queries.css").unwrap();
114+
writeln!(html_file, "<style>").unwrap();
115+
trace::write_style(&mut html_file);
116+
writeln!(html_file, "</style>\n</head>\n<body>").unwrap();
117+
trace::write_traces(&mut html_file, &mut counts_file, &frame.traces);
118+
writeln!(html_file, "</body>\n</html>").unwrap();
125119

126-
// Tell main thread that we are done, e.g., so it can exit
127-
params.ack.send(()).unwrap();
128-
}
129-
continue
120+
let ack_path = format!("{}.ack", params.path);
121+
let ack_file = File::create(&ack_path).unwrap();
122+
drop(ack_file);
123+
124+
// Tell main thread that we are done, e.g., so it can exit
125+
params.ack.send(()).unwrap();
130126
}
131127
// Actual query message:
132128
msg => {
133129
// Record msg in our log
134130
profq_msgs.push(msg.clone());
135131
// Respond to the message, knowing that we've already handled Halt and Dump, above.
136132
match (frame.parse_st.clone(), msg) {
137-
(_,ProfileQueriesMsg::Halt) => unreachable!(),
138-
(_,ProfileQueriesMsg::Dump(_)) => unreachable!(),
139-
133+
(_, ProfileQueriesMsg::Halt) | (_, ProfileQueriesMsg::Dump(_)) => {
134+
unreachable!();
135+
},
140136
// Parse State: Clear
141137
(ParseState::Clear,
142138
ProfileQueriesMsg::QueryBegin(span, querymsg)) => {
@@ -163,8 +159,8 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
163159
ParseState::HaveQuery(q, start) => {
164160
let duration = start.elapsed();
165161
frame = StackFrame{
166-
parse_st:ParseState::Clear,
167-
traces:old_frame.traces
162+
parse_st: ParseState::Clear,
163+
traces: old_frame.traces
168164
};
169165
let dur_extent = total_duration(&provider_extent);
170166
let trace = Rec {
@@ -181,18 +177,16 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
181177
}
182178
}
183179
},
184-
185-
186180
(ParseState::Clear,
187181
ProfileQueriesMsg::TimeBegin(msg)) => {
188182
let start = Instant::now();
189183
frame.parse_st = ParseState::HaveTimeBegin(msg, start);
190184
stack.push(frame);
191-
frame = StackFrame{parse_st:ParseState::Clear, traces:vec![]};
185+
frame = StackFrame{parse_st: ParseState::Clear, traces: vec![]};
186+
},
187+
(_, ProfileQueriesMsg::TimeBegin(_)) => {
188+
panic!("parse error; did not expect time begin here");
192189
},
193-
(_, ProfileQueriesMsg::TimeBegin(_)) =>
194-
panic!("parse error; did not expect time begin here"),
195-
196190
(ParseState::Clear,
197191
ProfileQueriesMsg::TimeEnd) => {
198192
let provider_extent = frame.traces;
@@ -204,8 +198,8 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
204198
ParseState::HaveTimeBegin(msg, start) => {
205199
let duration = start.elapsed();
206200
frame = StackFrame{
207-
parse_st:ParseState::Clear,
208-
traces:old_frame.traces
201+
parse_st: ParseState::Clear,
202+
traces: old_frame.traces
209203
};
210204
let dur_extent = total_duration(&provider_extent);
211205
let trace = Rec {
@@ -222,18 +216,19 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
222216
}
223217
}
224218
},
225-
(_, ProfileQueriesMsg::TimeEnd) => { panic!("parse error") }
226-
219+
(_, ProfileQueriesMsg::TimeEnd) => {
220+
panic!("parse error")
221+
},
227222
(ParseState::Clear,
228223
ProfileQueriesMsg::TaskBegin(key)) => {
229224
let start = Instant::now();
230225
frame.parse_st = ParseState::HaveTaskBegin(key, start);
231226
stack.push(frame);
232-
frame = StackFrame{parse_st:ParseState::Clear, traces:vec![]};
227+
frame = StackFrame{ parse_st: ParseState::Clear, traces: vec![] };
228+
},
229+
(_, ProfileQueriesMsg::TaskBegin(_)) => {
230+
panic!("parse error; did not expect time begin here");
233231
},
234-
(_, ProfileQueriesMsg::TaskBegin(_)) =>
235-
panic!("parse error; did not expect time begin here"),
236-
237232
(ParseState::Clear,
238233
ProfileQueriesMsg::TaskEnd) => {
239234
let provider_extent = frame.traces;
@@ -245,8 +240,8 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
245240
ParseState::HaveTaskBegin(key, start) => {
246241
let duration = start.elapsed();
247242
frame = StackFrame{
248-
parse_st:ParseState::Clear,
249-
traces:old_frame.traces
243+
parse_st: ParseState::Clear,
244+
traces: old_frame.traces
250245
};
251246
let dur_extent = total_duration(&provider_extent);
252247
let trace = Rec {
@@ -263,8 +258,9 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
263258
}
264259
}
265260
},
266-
(_, ProfileQueriesMsg::TaskEnd) => { panic!("parse error") }
267-
261+
(_, ProfileQueriesMsg::TaskEnd) => {
262+
panic!("parse error")
263+
},
268264
// Parse State: HaveQuery
269265
(ParseState::HaveQuery(q,start),
270266
ProfileQueriesMsg::CacheHit) => {
@@ -279,26 +275,25 @@ fn profile_queries_thread(r: Receiver<ProfileQueriesMsg>) {
279275
frame.traces.push( trace );
280276
frame.parse_st = ParseState::Clear;
281277
},
282-
(ParseState::HaveQuery(_,_),
278+
(ParseState::HaveQuery(_, _),
283279
ProfileQueriesMsg::ProviderBegin) => {
284280
stack.push(frame);
285-
frame = StackFrame{parse_st:ParseState::Clear, traces:vec![]};
281+
frame = StackFrame{ parse_st: ParseState::Clear, traces: vec![] };
286282
},
287283

288284
// Parse errors:
289285

290-
(ParseState::HaveQuery(q,_),
286+
(ParseState::HaveQuery(q, _),
291287
ProfileQueriesMsg::ProviderEnd) => {
292288
panic!("parse error: unexpected ProviderEnd; \
293289
expected something else to follow BeginQuery for {:?}", q)
294290
},
295-
(ParseState::HaveQuery(q1,_),
296-
ProfileQueriesMsg::QueryBegin(span2,querymsg2)) => {
291+
(ParseState::HaveQuery(q1, _),
292+
ProfileQueriesMsg::QueryBegin(span2, querymsg2)) => {
297293
panic!("parse error: unexpected QueryBegin; \
298294
earlier query is unfinished: {:?} and now {:?}",
299-
q1, Query{span:span2, msg:querymsg2})
295+
q1, Query{span:span2, msg: querymsg2})
300296
},
301-
302297
(ParseState::HaveTimeBegin(_, _), _) => {
303298
unreachable!()
304299
},

‎src/librustc_lint/lib.rs

+9
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ use rustc::lint::builtin::{
5353
ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE,
5454
ELIDED_LIFETIMES_IN_PATHS,
5555
EXPLICIT_OUTLIVES_REQUIREMENTS,
56+
INTRA_DOC_LINK_RESOLUTION_FAILURE,
57+
MISSING_DOC_CODE_EXAMPLES,
58+
PRIVATE_DOC_TESTS,
5659
parser::QUESTION_MARK_MACRO_SEP
5760
};
5861
use rustc::session;
@@ -204,6 +207,12 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
204207
// MACRO_USE_EXTERN_CRATE,
205208
);
206209

210+
add_lint_group!(sess,
211+
"rustdoc",
212+
INTRA_DOC_LINK_RESOLUTION_FAILURE,
213+
MISSING_DOC_CODE_EXAMPLES,
214+
PRIVATE_DOC_TESTS);
215+
207216
// Guidelines for creating a future incompatibility lint:
208217
//
209218
// - Create a lint defaulting to warn as normal, with ideally the same error

0 commit comments

Comments
 (0)