Skip to content

Commit 1433507

Browse files
borsbors
committed
Auto merge of #55738 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
1.30.1 stable release I believe this includes all of the relevant pieces from #55594. Backports all proceeded smoothly. cc @rust-lang/release
2 parents da5f414 + 59e6ce4 commit 1433507

File tree

10 files changed

+229
-24
lines changed

10 files changed

+229
-24
lines changed

‎RELEASES.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
Version 1.30.1 (2018-11-08)
2+
===========================
3+
4+
- [Fixed overflow ICE in rustdoc][54199]
5+
- [Cap Cargo progress bar width at 60 in MSYS terminals][cargo/6122]
6+
7+
[54199]: https://github.com/rust-lang/rust/pull/54199
8+
[cargo/6122]: https://github.com/rust-lang/cargo/pull/6122
9+
110
Version 1.30.0 (2018-10-25)
211
==========================
312

@@ -64,9 +73,6 @@ Cargo
6473
- [`cargo run` doesn't require specifying a package in workspaces.][cargo/5877]
6574
- [`cargo doc` now supports `--message-format=json`.][cargo/5878] This is
6675
equivalent to calling `rustdoc --error-format=json`.
67-
- [You can specify which edition to create a project in cargo
68-
with `cargo new --edition`.][cargo/5984] Currently only `2015` is a
69-
valid option.
7076
- [Cargo will now provide a progress bar for builds.][cargo/5995]
7177

7278
Misc
@@ -100,9 +106,8 @@ Misc
100106
[54404]: https://github.com/rust-lang/rust/pull/54404/
101107
[cargo/5877]: https://github.com/rust-lang/cargo/pull/5877/
102108
[cargo/5878]: https://github.com/rust-lang/cargo/pull/5878/
103-
[cargo/5984]: https://github.com/rust-lang/cargo/pull/5984/
104109
[cargo/5995]: https://github.com/rust-lang/cargo/pull/5995/
105-
[proc-macros]: https://doc.rust-lang.org/book/2018-edition/ch19-06-macros.html
110+
[proc-macros]: https://doc.rust-lang.org/nightly/book/2018-edition/ch19-06-macros.html
106111

107112
[`Ipv4Addr::BROADCAST`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv4Addr.html#associatedconstant.BROADCAST
108113
[`Ipv4Addr::LOCALHOST`]: https://doc.rust-lang.org/nightly/std/net/struct.Ipv4Addr.html#associatedconstant.LOCALHOST

‎src/bootstrap/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use Build;
2424
use config::Config;
2525

2626
// The version number
27-
pub const CFG_RELEASE_NUM: &str = "1.30.0";
27+
pub const CFG_RELEASE_NUM: &str = "1.30.1";
2828

2929
pub struct GitInfo {
3030
inner: Option<Info>,

‎src/librustc/traits/project.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ fn project_type<'cx, 'gcx, 'tcx>(
894894
let recursion_limit = *selcx.tcx().sess.recursion_limit.get();
895895
if obligation.recursion_depth >= recursion_limit {
896896
debug!("project: overflow!");
897-
selcx.infcx().report_overflow_error(&obligation, true);
897+
return Err(ProjectionTyError::TraitSelectionError(SelectionError::Overflow));
898898
}
899899

900900
let obligation_trait_ref = &obligation.predicate.trait_ref(selcx.tcx());

‎src/librustc/traits/query/evaluate_obligation.rs

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
2020
&self,
2121
obligation: &PredicateObligation<'tcx>,
2222
) -> bool {
23-
self.evaluate_obligation(obligation).may_apply()
23+
self.evaluate_obligation_no_overflow(obligation).may_apply()
2424
}
2525

2626
/// Evaluates whether the predicate can be satisfied in the given
@@ -30,28 +30,44 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
3030
&self,
3131
obligation: &PredicateObligation<'tcx>,
3232
) -> bool {
33-
self.evaluate_obligation(obligation) == EvaluationResult::EvaluatedToOk
33+
self.evaluate_obligation_no_overflow(obligation) == EvaluationResult::EvaluatedToOk
3434
}
3535

36-
// Helper function that canonicalizes and runs the query, as well as handles
37-
// overflow.
38-
fn evaluate_obligation(
36+
/// Evaluate a given predicate, capturing overflow and propagating it back.
37+
pub fn evaluate_obligation(
3938
&self,
4039
obligation: &PredicateObligation<'tcx>,
41-
) -> EvaluationResult {
40+
) -> Result<EvaluationResult, OverflowError> {
4241
let mut _orig_values = SmallVec::new();
4342
let c_pred = self.canonicalize_query(&obligation.param_env.and(obligation.predicate),
4443
&mut _orig_values);
4544
// Run canonical query. If overflow occurs, rerun from scratch but this time
4645
// in standard trait query mode so that overflow is handled appropriately
4746
// within `SelectionContext`.
48-
match self.tcx.global_tcx().evaluate_obligation(c_pred) {
47+
self.tcx.global_tcx().evaluate_obligation(c_pred)
48+
}
49+
50+
// Helper function that canonicalizes and runs the query. If an
51+
// overflow results, we re-run it in the local context so we can
52+
// report a nice error.
53+
fn evaluate_obligation_no_overflow(
54+
&self,
55+
obligation: &PredicateObligation<'tcx>,
56+
) -> EvaluationResult {
57+
match self.evaluate_obligation(obligation) {
4958
Ok(result) => result,
5059
Err(OverflowError) => {
5160
let mut selcx =
5261
SelectionContext::with_query_mode(&self, TraitQueryMode::Standard);
5362
selcx.evaluate_obligation_recursively(obligation)
54-
.expect("Overflow should be caught earlier in standard query mode")
63+
.unwrap_or_else(|r| {
64+
span_bug!(
65+
obligation.cause.span,
66+
"Overflow should be caught earlier in standard query mode: {:?}, {:?}",
67+
obligation,
68+
r,
69+
)
70+
})
5571
}
5672
}
5773
}

‎src/librustc/traits/select.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,10 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
13761376
let tcx = self.tcx();
13771377
let trait_ref = cache_fresh_trait_pred.skip_binder().trait_ref;
13781378
if self.can_use_global_caches(param_env) {
1379-
if let Some(trait_ref) = tcx.lift_to_global(&trait_ref) {
1379+
if let Err(Overflow) = candidate {
1380+
// Don't cache overflow globally; we only produce this
1381+
// in certain modes.
1382+
} else if let Some(trait_ref) = tcx.lift_to_global(&trait_ref) {
13801383
if let Some(candidate) = tcx.lift_to_global(&candidate) {
13811384
debug!(
13821385
"insert_candidate_cache(trait_ref={:?}, candidate={:?}) global",

‎src/librustc/traits/structural_impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl<'a, 'tcx> Lift<'tcx> for traits::SelectionError<'a> {
175175
super::ConstEvalFailure(ref err) => tcx.lift(&**err).map(|err| super::ConstEvalFailure(
176176
err.into(),
177177
)),
178-
super::Overflow => bug!(), // FIXME: ape ConstEvalFailure?
178+
super::Overflow => Some(super::Overflow),
179179
}
180180
}
181181
}

‎src/librustdoc/clean/blanket_impl.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,20 @@ impl<'a, 'tcx, 'rcx, 'cstore> BlanketImplFinder <'a, 'tcx, 'rcx, 'cstore> {
103103
// FIXME(eddyb) ignoring `obligations` might cause false positives.
104104
drop(obligations);
105105

106-
let may_apply = infcx.predicate_may_hold(&traits::Obligation::new(
107-
cause.clone(),
108-
param_env,
109-
trait_ref.to_predicate(),
110-
));
106+
debug!(
107+
"invoking predicate_may_hold: {:?}",
108+
trait_ref,
109+
);
110+
let may_apply = match infcx.evaluate_obligation(
111+
&traits::Obligation::new(
112+
cause.clone(),
113+
param_env,
114+
trait_ref.to_predicate(),
115+
),
116+
) {
117+
Ok(eval_result) => eval_result.may_apply(),
118+
Err(traits::OverflowError) => true, // overflow doesn't mean yes *or* no
119+
};
111120
if !may_apply {
112121
return
113122
}

‎src/test/rustdoc/issue-52873.rs

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
// Regression test for #52873. We used to ICE due to unexpected
2+
// overflows when checking for "blanket impl inclusion".
3+
4+
use std::marker::PhantomData;
5+
use std::cmp::Ordering;
6+
use std::ops::{Add, Mul};
7+
8+
pub type True = B1;
9+
pub type False = B0;
10+
pub type U0 = UTerm;
11+
pub type U1 = UInt<UTerm, B1>;
12+
13+
pub trait NonZero {}
14+
15+
pub trait Bit {
16+
}
17+
18+
pub trait Unsigned {
19+
}
20+
21+
#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
22+
pub struct B0;
23+
24+
impl B0 {
25+
#[inline]
26+
pub fn new() -> B0 {
27+
B0
28+
}
29+
}
30+
31+
#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
32+
pub struct B1;
33+
34+
impl B1 {
35+
#[inline]
36+
pub fn new() -> B1 {
37+
B1
38+
}
39+
}
40+
41+
impl Bit for B0 {
42+
}
43+
44+
impl Bit for B1 {
45+
}
46+
47+
impl NonZero for B1 {}
48+
49+
pub trait PrivatePow<Y, N> {
50+
type Output;
51+
}
52+
pub type PrivatePowOut<A, Y, N> = <A as PrivatePow<Y, N>>::Output;
53+
54+
pub type Add1<A> = <A as Add<::B1>>::Output;
55+
pub type Prod<A, B> = <A as Mul<B>>::Output;
56+
pub type Square<A> = <A as Mul>::Output;
57+
pub type Sum<A, B> = <A as Add<B>>::Output;
58+
59+
#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
60+
pub struct UTerm;
61+
62+
impl UTerm {
63+
#[inline]
64+
pub fn new() -> UTerm {
65+
UTerm
66+
}
67+
}
68+
69+
impl Unsigned for UTerm {
70+
}
71+
72+
#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash, Debug, Default)]
73+
pub struct UInt<U, B> {
74+
_marker: PhantomData<(U, B)>,
75+
}
76+
77+
impl<U: Unsigned, B: Bit> UInt<U, B> {
78+
#[inline]
79+
pub fn new() -> UInt<U, B> {
80+
UInt {
81+
_marker: PhantomData,
82+
}
83+
}
84+
}
85+
86+
impl<U: Unsigned, B: Bit> Unsigned for UInt<U, B> {
87+
}
88+
89+
impl<U: Unsigned, B: Bit> NonZero for UInt<U, B> {}
90+
91+
impl Add<B0> for UTerm {
92+
type Output = UTerm;
93+
fn add(self, _: B0) -> Self::Output {
94+
UTerm
95+
}
96+
}
97+
98+
impl<U: Unsigned, B: Bit> Add<B0> for UInt<U, B> {
99+
type Output = UInt<U, B>;
100+
fn add(self, _: B0) -> Self::Output {
101+
UInt::new()
102+
}
103+
}
104+
105+
impl<U: Unsigned> Add<U> for UTerm {
106+
type Output = U;
107+
fn add(self, _: U) -> Self::Output {
108+
unsafe { ::std::mem::uninitialized() }
109+
}
110+
}
111+
112+
impl<U: Unsigned, B: Bit> Mul<B0> for UInt<U, B> {
113+
type Output = UTerm;
114+
fn mul(self, _: B0) -> Self::Output {
115+
UTerm
116+
}
117+
}
118+
119+
impl<U: Unsigned, B: Bit> Mul<B1> for UInt<U, B> {
120+
type Output = UInt<U, B>;
121+
fn mul(self, _: B1) -> Self::Output {
122+
UInt::new()
123+
}
124+
}
125+
126+
impl<U: Unsigned> Mul<U> for UTerm {
127+
type Output = UTerm;
128+
fn mul(self, _: U) -> Self::Output {
129+
UTerm
130+
}
131+
}
132+
133+
impl<Ul: Unsigned, B: Bit, Ur: Unsigned> Mul<UInt<Ur, B>> for UInt<Ul, B0>
134+
where
135+
Ul: Mul<UInt<Ur, B>>,
136+
{
137+
type Output = UInt<Prod<Ul, UInt<Ur, B>>, B0>;
138+
fn mul(self, _: UInt<Ur, B>) -> Self::Output {
139+
unsafe { ::std::mem::uninitialized() }
140+
}
141+
}
142+
143+
pub trait Pow<Exp> {
144+
type Output;
145+
}
146+
147+
impl<X: Unsigned, N: Unsigned> Pow<N> for X
148+
where
149+
X: PrivatePow<U1, N>,
150+
{
151+
type Output = PrivatePowOut<X, U1, N>;
152+
}
153+
154+
impl<Y: Unsigned, X: Unsigned> PrivatePow<Y, U0> for X {
155+
type Output = Y;
156+
}
157+
158+
impl<Y: Unsigned, X: Unsigned> PrivatePow<Y, U1> for X
159+
where
160+
X: Mul<Y>,
161+
{
162+
type Output = Prod<X, Y>;
163+
}
164+
165+
impl<Y: Unsigned, U: Unsigned, B: Bit, X: Unsigned> PrivatePow<Y, UInt<UInt<U, B>, B0>> for X
166+
where
167+
X: Mul,
168+
Square<X>: PrivatePow<Y, UInt<U, B>>,
169+
{
170+
type Output = PrivatePowOut<Square<X>, Y, UInt<U, B>>;
171+
}

‎src/test/ui/issues/issue-23122-2.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next`
1+
error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next: std::marker::Sized`
22
--> $DIR/issue-23122-2.rs:17:15
33
|
44
LL | impl<T: Next> Next for GetNext<T> {
55
| ^^^^
66
|
77
= help: consider adding a `#![recursion_limit="128"]` attribute to your crate
8+
= note: required because of the requirements on the impl of `Next` for `GetNext<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next>`
89

910
error: aborting due to previous error
1011

‎src/tools/cargo

0 commit comments

Comments
 (0)