Skip to content

Commit 9a90d03

Browse files
borsbors
committed
Auto merge of rust-lang#62226 - Centril:rollup-rcy1alx, r=Centril
Rollup of 7 pull requests Successful merges: - rust-lang#61199 (Revert "Set test flag when rustdoc is running with --test option" ) - rust-lang#61755 (Add `--pass $mode` to compiletest through `./x.py`) - rust-lang#61818 (Issue rust-lang#60709 test) - rust-lang#62023 (publish_toolstate: don't use 'new' from inside the loop) - rust-lang#62104 (Inform the query system about properties of queries at compile time) - rust-lang#62163 (Avoid mem::uninitialized() in std::sys::unix) - rust-lang#62204 (doc(libcore) Fix CS) Failed merges: r? @ghost
2 parents 8ec3942 + 38801ce commit 9a90d03

Some content is hidden

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

41 files changed

+392
-224
lines changed

‎src/bootstrap/builder/tests.rs

+2
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ fn test_with_no_doc_stage0() {
598598
bless: false,
599599
compare_mode: None,
600600
rustfix_coverage: false,
601+
pass: None,
601602
};
602603

603604
let build = Build::new(config);
@@ -640,6 +641,7 @@ fn test_exclude() {
640641
bless: false,
641642
compare_mode: None,
642643
rustfix_coverage: false,
644+
pass: None,
643645
};
644646

645647
let build = Build::new(config);

‎src/bootstrap/flags.rs

+17
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ pub enum Subcommand {
5858
/// Whether to automatically update stderr/stdout files
5959
bless: bool,
6060
compare_mode: Option<String>,
61+
pass: Option<String>,
6162
test_args: Vec<String>,
6263
rustc_args: Vec<String>,
6364
fail_fast: bool,
@@ -199,6 +200,12 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`"
199200
"mode describing what file the actual ui output will be compared to",
200201
"COMPARE MODE",
201202
);
203+
opts.optopt(
204+
"",
205+
"pass",
206+
"force {check,build,run}-pass tests to this mode.",
207+
"check | build | run"
208+
);
202209
opts.optflag(
203210
"",
204211
"rustfix-coverage",
@@ -401,6 +408,7 @@ Arguments:
401408
paths,
402409
bless: matches.opt_present("bless"),
403410
compare_mode: matches.opt_str("compare-mode"),
411+
pass: matches.opt_str("pass"),
404412
test_args: matches.opt_strs("test-args"),
405413
rustc_args: matches.opt_strs("rustc-args"),
406414
fail_fast: !matches.opt_present("no-fail-fast"),
@@ -524,6 +532,15 @@ impl Subcommand {
524532
_ => None,
525533
}
526534
}
535+
536+
pub fn pass(&self) -> Option<&str> {
537+
match *self {
538+
Subcommand::Test {
539+
ref pass, ..
540+
} => pass.as_ref().map(|s| &s[..]),
541+
_ => None,
542+
}
543+
}
527544
}
528545

529546
fn split(s: &[String]) -> Vec<String> {

‎src/bootstrap/test.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,11 @@ impl Step for Compiletest {
10651065
}
10661066
});
10671067

1068+
if let Some(ref pass) = builder.config.cmd.pass() {
1069+
cmd.arg("--pass");
1070+
cmd.arg(pass);
1071+
}
1072+
10681073
if let Some(ref nodejs) = builder.config.nodejs {
10691074
cmd.arg("--nodejs").arg(nodejs);
10701075
}

‎src/libcore/iter/traits/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ pub trait FromIterator<A>: Sized {
196196
/// ```rust
197197
/// fn collect_as_strings<T>(collection: T) -> Vec<String>
198198
/// where T: IntoIterator,
199-
/// T::Item : std::fmt::Debug,
199+
/// T::Item: std::fmt::Debug,
200200
/// {
201201
/// collection
202202
/// .into_iter()

‎src/libcore/marker.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ impl<T: ?Sized> !Send for *mut T { }
7373
/// impl Foo for Impl { }
7474
/// impl Bar for Impl { }
7575
///
76-
/// let x: &Foo = &Impl; // OK
77-
/// // let y: &Bar = &Impl; // error: the trait `Bar` cannot
78-
/// // be made into an object
76+
/// let x: &dyn Foo = &Impl; // OK
77+
/// // let y: &dyn Bar = &Impl; // error: the trait `Bar` cannot
78+
/// // be made into an object
7979
/// ```
8080
///
8181
/// [trait object]: ../../book/ch17-02-trait-objects.html

‎src/libcore/mem/mod.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
510510
/// A simple example:
511511
///
512512
/// ```
513+
/// #![feature(mem_take)]
514+
///
513515
/// use std::mem;
514516
///
515517
/// let mut v: Vec<i32> = vec![1, 2];
@@ -540,7 +542,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
540542
/// `self`, allowing it to be returned:
541543
///
542544
/// ```
543-
/// # #![allow(dead_code)]
545+
/// #![feature(mem_take)]
546+
///
544547
/// use std::mem;
545548
///
546549
/// # struct Buffer<T> { buf: Vec<T> }

‎src/libcore/raw.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
/// let value: i32 = 123;
5454
///
5555
/// // let the compiler make a trait object
56-
/// let object: &Foo = &value;
56+
/// let object: &dyn Foo = &value;
5757
///
5858
/// // look at the raw representation
5959
/// let raw_object: raw::TraitObject = unsafe { mem::transmute(object) };
@@ -65,7 +65,7 @@
6565
///
6666
/// // construct a new object, pointing to a different `i32`, being
6767
/// // careful to use the `i32` vtable from `object`
68-
/// let synthesized: &Foo = unsafe {
68+
/// let synthesized: &dyn Foo = unsafe {
6969
/// mem::transmute(raw::TraitObject {
7070
/// data: &other_value as *const _ as *mut (),
7171
/// vtable: raw_object.vtable,

‎src/librustc/dep_graph/dep_node.rs

-4
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@ macro_rules! define_dep_nodes {
142142
}
143143
}
144144

145-
// FIXME: Make `is_anon`, `is_eval_always` and `has_params` properties
146-
// of queries
147-
#[inline(always)]
148145
pub fn is_anon(&self) -> bool {
149146
match *self {
150147
$(
@@ -163,7 +160,6 @@ macro_rules! define_dep_nodes {
163160
}
164161

165162
#[allow(unreachable_code)]
166-
#[inline(always)]
167163
pub fn has_params(&self) -> bool {
168164
match *self {
169165
$(

‎src/librustc/ty/query/config.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::dep_graph::SerializedDepNodeIndex;
2-
use crate::dep_graph::DepNode;
2+
use crate::dep_graph::{DepKind, DepNode};
33
use crate::hir::def_id::{CrateNum, DefId};
44
use crate::ty::TyCtxt;
55
use crate::ty::query::queries;
@@ -28,13 +28,18 @@ pub trait QueryConfig<'tcx> {
2828
}
2929

3030
pub(crate) trait QueryAccessors<'tcx>: QueryConfig<'tcx> {
31+
const ANON: bool;
32+
const EVAL_ALWAYS: bool;
33+
3134
fn query(key: Self::Key) -> Query<'tcx>;
3235

3336
// Don't use this method to access query results, instead use the methods on TyCtxt
3437
fn query_cache<'a>(tcx: TyCtxt<'tcx>) -> &'a Lock<QueryCache<'tcx, Self>>;
3538

3639
fn to_dep_node(tcx: TyCtxt<'tcx>, key: &Self::Key) -> DepNode;
3740

41+
fn dep_kind() -> DepKind;
42+
3843
// Don't use this method to compute query results, instead use the methods on TyCtxt
3944
fn compute(tcx: TyCtxt<'tcx>, key: Self::Key) -> Self::Value;
4045

‎src/librustc/ty/query/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ pub use self::on_disk_cache::OnDiskCache;
101101
rustc_query_append! { [define_queries!][ <'tcx>
102102
Other {
103103
/// Runs analysis passes on the crate.
104-
[] fn analysis: Analysis(CrateNum) -> Result<(), ErrorReported>,
104+
[eval_always] fn analysis: Analysis(CrateNum) -> Result<(), ErrorReported>,
105105
},
106106
]}

‎src/librustc/ty/query/plumbing.rs

+45-12
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,13 @@ impl<'tcx> TyCtxt<'tcx> {
376376
return self.force_query_with_job::<Q>(key, job, null_dep_node).0;
377377
}
378378

379-
let dep_node = Q::to_dep_node(self, &key);
380-
381-
if dep_node.kind.is_anon() {
379+
if Q::ANON {
382380
profq_msg!(self, ProfileQueriesMsg::ProviderBegin);
383381
self.sess.profiler(|p| p.start_query(Q::NAME));
384382

385383
let ((result, dep_node_index), diagnostics) = with_diagnostics(|diagnostics| {
386384
self.start_query(job.job.clone(), diagnostics, |tcx| {
387-
tcx.dep_graph.with_anon_task(dep_node.kind, || {
385+
tcx.dep_graph.with_anon_task(Q::dep_kind(), || {
388386
Q::compute(tcx.global_tcx(), key)
389387
})
390388
})
@@ -405,7 +403,9 @@ impl<'tcx> TyCtxt<'tcx> {
405403
return result;
406404
}
407405

408-
if !dep_node.kind.is_eval_always() {
406+
let dep_node = Q::to_dep_node(self, &key);
407+
408+
if !Q::EVAL_ALWAYS {
409409
// The diagnostics for this query will be
410410
// promoted to the current session during
411411
// try_mark_green(), so we can ignore them here.
@@ -546,7 +546,7 @@ impl<'tcx> TyCtxt<'tcx> {
546546

547547
let ((result, dep_node_index), diagnostics) = with_diagnostics(|diagnostics| {
548548
self.start_query(job.job.clone(), diagnostics, |tcx| {
549-
if dep_node.kind.is_eval_always() {
549+
if Q::EVAL_ALWAYS {
550550
tcx.dep_graph.with_eval_always_task(dep_node,
551551
tcx,
552552
key,
@@ -569,8 +569,8 @@ impl<'tcx> TyCtxt<'tcx> {
569569
self.dep_graph.mark_loaded_from_cache(dep_node_index, false);
570570
}
571571

572-
if dep_node.kind != crate::dep_graph::DepKind::Null {
573-
if unlikely!(!diagnostics.is_empty()) {
572+
if unlikely!(!diagnostics.is_empty()) {
573+
if dep_node.kind != crate::dep_graph::DepKind::Null {
574574
self.queries.on_disk_cache
575575
.store_diagnostics(dep_node_index, diagnostics);
576576
}
@@ -589,15 +589,16 @@ impl<'tcx> TyCtxt<'tcx> {
589589
///
590590
/// Note: The optimization is only available during incr. comp.
591591
pub(super) fn ensure_query<Q: QueryDescription<'tcx>>(self, key: Q::Key) -> () {
592-
let dep_node = Q::to_dep_node(self, &key);
593-
594-
if dep_node.kind.is_eval_always() {
592+
if Q::EVAL_ALWAYS {
595593
let _ = self.get_query::<Q>(DUMMY_SP, key);
596594
return;
597595
}
598596

599597
// Ensuring an anonymous query makes no sense
600-
assert!(!dep_node.kind.is_anon());
598+
assert!(!Q::ANON);
599+
600+
let dep_node = Q::to_dep_node(self, &key);
601+
601602
if self.dep_graph.try_mark_green_and_read(self, &dep_node).is_none() {
602603
// A None return from `try_mark_green_and_read` means that this is either
603604
// a new dep node or that the dep node has already been marked red.
@@ -653,6 +654,30 @@ macro_rules! handle_cycle_error {
653654
};
654655
}
655656

657+
macro_rules! is_anon {
658+
([]) => {{
659+
false
660+
}};
661+
([anon$(, $modifiers:ident)*]) => {{
662+
true
663+
}};
664+
([$other:ident$(, $modifiers:ident)*]) => {
665+
is_anon!([$($modifiers),*])
666+
};
667+
}
668+
669+
macro_rules! is_eval_always {
670+
([]) => {{
671+
false
672+
}};
673+
([eval_always$(, $modifiers:ident)*]) => {{
674+
true
675+
}};
676+
([$other:ident$(, $modifiers:ident)*]) => {
677+
is_eval_always!([$($modifiers),*])
678+
};
679+
}
680+
656681
macro_rules! hash_result {
657682
([][$hcx:expr, $result:expr]) => {{
658683
dep_graph::hash_result($hcx, &$result)
@@ -933,6 +958,9 @@ macro_rules! define_queries_inner {
933958
}
934959

935960
impl<$tcx> QueryAccessors<$tcx> for queries::$name<$tcx> {
961+
const ANON: bool = is_anon!([$($modifiers)*]);
962+
const EVAL_ALWAYS: bool = is_eval_always!([$($modifiers)*]);
963+
936964
#[inline(always)]
937965
fn query(key: Self::Key) -> Query<'tcx> {
938966
Query::$name(key)
@@ -951,6 +979,11 @@ macro_rules! define_queries_inner {
951979
DepNode::new(tcx, $node(*key))
952980
}
953981

982+
#[inline(always)]
983+
fn dep_kind() -> dep_graph::DepKind {
984+
dep_graph::DepKind::$node
985+
}
986+
954987
#[inline]
955988
fn compute(tcx: TyCtxt<'tcx>, key: Self::Key) -> Self::Value {
956989
__query_compute::$name(move || {

‎src/librustc_macros/src/query.rs

+6-14
Original file line numberDiff line numberDiff line change
@@ -423,20 +423,6 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
423423
if modifiers.no_hash {
424424
attributes.push(quote! { no_hash });
425425
};
426-
427-
let mut attribute_stream = quote! {};
428-
429-
for e in attributes.into_iter().intersperse(quote! {,}) {
430-
attribute_stream.extend(e);
431-
}
432-
433-
// Add the query to the group
434-
group_stream.extend(quote! {
435-
[#attribute_stream] fn #name: #name(#arg) #result,
436-
});
437-
438-
let mut attributes = Vec::new();
439-
440426
// Pass on the anon modifier
441427
if modifiers.anon {
442428
attributes.push(quote! { anon });
@@ -450,6 +436,12 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
450436
for e in attributes.into_iter().intersperse(quote! {,}) {
451437
attribute_stream.extend(e);
452438
}
439+
440+
// Add the query to the group
441+
group_stream.extend(quote! {
442+
[#attribute_stream] fn #name: #name(#arg) #result,
443+
});
444+
453445
// Create a dep node for the query
454446
dep_node_def_stream.extend(quote! {
455447
[#attribute_stream] #name(#arg),

‎src/librustdoc/config.rs

-3
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,6 @@ impl Options {
351351
.unwrap_or_else(|| PathBuf::from("doc"));
352352
let mut cfgs = matches.opt_strs("cfg");
353353
cfgs.push("rustdoc".to_string());
354-
if should_test {
355-
cfgs.push("test".to_string());
356-
}
357354

358355
let extension_css = matches.opt_str("e").map(|s| PathBuf::from(&s));
359356

‎src/libstd/sys/unix/condvar.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ impl Condvar {
4040
target_os = "android",
4141
target_os = "hermit")))]
4242
pub unsafe fn init(&mut self) {
43-
use crate::mem;
44-
let mut attr: libc::pthread_condattr_t = mem::uninitialized();
45-
let r = libc::pthread_condattr_init(&mut attr);
43+
use crate::mem::MaybeUninit;
44+
let mut attr = MaybeUninit::<libc::pthread_condattr_t>::uninit();
45+
let r = libc::pthread_condattr_init(attr.as_mut_ptr());
4646
assert_eq!(r, 0);
47-
let r = libc::pthread_condattr_setclock(&mut attr, libc::CLOCK_MONOTONIC);
47+
let r = libc::pthread_condattr_setclock(attr.as_mut_ptr(), libc::CLOCK_MONOTONIC);
4848
assert_eq!(r, 0);
49-
let r = libc::pthread_cond_init(self.inner.get(), &attr);
49+
let r = libc::pthread_cond_init(self.inner.get(), attr.as_ptr());
5050
assert_eq!(r, 0);
51-
let r = libc::pthread_condattr_destroy(&mut attr);
51+
let r = libc::pthread_condattr_destroy(attr.as_mut_ptr());
5252
assert_eq!(r, 0);
5353
}
5454

0 commit comments

Comments
 (0)