Skip to content

Commit b544b43

Browse files
borsbors
committed
Auto merge of #74994 - JohnTitor:rollup-eknaekv, r=JohnTitor
Rollup of 6 pull requests Successful merges: - #74644 (Remove `linked_list_extras` methods.) - #74968 (Run all tests if have no specified tests) - #74982 (1.45.2 release notes) - #74984 (Miri: fix ICE when unwinding past topmost stack frame) - #74986 (fix part of comparison that would always evaluate to "true", probably an oversight) - #74991 (Fix Const-Generic Cycle ICE #74199) Failed merges: r? @ghost
2 parents 6e87bac + 3ad6fed commit b544b43

File tree

9 files changed

+207
-66
lines changed

9 files changed

+207
-66
lines changed

‎RELEASES.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
Version 1.45.2 (2020-08-03)
2+
==========================
3+
4+
* [Fix bindings in tuple struct patterns][74954]
5+
* [Fix track_caller integration with trait objects][74784]
6+
7+
[74954]: https://github.com/rust-lang/rust/issues/74954
8+
[74784]: https://github.com/rust-lang/rust/issues/74784
9+
110
Version 1.45.1 (2020-07-30)
211
==========================
312

‎library/alloc/src/collections/linked_list.rs

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,32 +1110,17 @@ impl<T> IterMut<'_, T> {
11101110
/// Inserts the given element just after the element most recently returned by `.next()`.
11111111
/// The inserted element does not appear in the iteration.
11121112
///
1113-
/// # Examples
1114-
///
1115-
/// ```
1116-
/// #![feature(linked_list_extras)]
1117-
///
1118-
/// use std::collections::LinkedList;
1119-
///
1120-
/// let mut list: LinkedList<_> = vec![1, 3, 4].into_iter().collect();
1121-
///
1122-
/// {
1123-
/// let mut it = list.iter_mut();
1124-
/// assert_eq!(it.next().unwrap(), &1);
1125-
/// // insert `2` after `1`
1126-
/// it.insert_next(2);
1127-
/// }
1128-
/// {
1129-
/// let vec: Vec<_> = list.into_iter().collect();
1130-
/// assert_eq!(vec, [1, 2, 3, 4]);
1131-
/// }
1132-
/// ```
1113+
/// This method will be removed soon.
11331114
#[inline]
11341115
#[unstable(
11351116
feature = "linked_list_extras",
11361117
reason = "this is probably better handled by a cursor type -- we'll see",
11371118
issue = "27794"
11381119
)]
1120+
#[rustc_deprecated(
1121+
reason = "Deprecated in favor of CursorMut methods. This method will be removed soon.",
1122+
since = "1.47.0"
1123+
)]
11391124
pub fn insert_next(&mut self, element: T) {
11401125
match self.head {
11411126
// `push_back` is okay with aliasing `element` references
@@ -1163,27 +1148,17 @@ impl<T> IterMut<'_, T> {
11631148

11641149
/// Provides a reference to the next element, without changing the iterator.
11651150
///
1166-
/// # Examples
1167-
///
1168-
/// ```
1169-
/// #![feature(linked_list_extras)]
1170-
///
1171-
/// use std::collections::LinkedList;
1172-
///
1173-
/// let mut list: LinkedList<_> = vec![1, 2, 3].into_iter().collect();
1174-
///
1175-
/// let mut it = list.iter_mut();
1176-
/// assert_eq!(it.next().unwrap(), &1);
1177-
/// assert_eq!(it.peek_next().unwrap(), &2);
1178-
/// // We just peeked at 2, so it was not consumed from the iterator.
1179-
/// assert_eq!(it.next().unwrap(), &2);
1180-
/// ```
1151+
/// This method will be removed soon.
11811152
#[inline]
11821153
#[unstable(
11831154
feature = "linked_list_extras",
11841155
reason = "this is probably better handled by a cursor type -- we'll see",
11851156
issue = "27794"
11861157
)]
1158+
#[rustc_deprecated(
1159+
reason = "Deprecated in favor of CursorMut methods. This method will be removed soon.",
1160+
since = "1.47.0"
1161+
)]
11871162
pub fn peek_next(&mut self) -> Option<&mut T> {
11881163
if self.len == 0 {
11891164
None

‎library/alloc/src/collections/linked_list/tests.rs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -153,33 +153,6 @@ fn test_clone_from() {
153153
}
154154
}
155155

156-
#[test]
157-
fn test_insert_prev() {
158-
let mut m = list_from(&[0, 2, 4, 6, 8]);
159-
let len = m.len();
160-
{
161-
let mut it = m.iter_mut();
162-
it.insert_next(-2);
163-
loop {
164-
match it.next() {
165-
None => break,
166-
Some(elt) => {
167-
it.insert_next(*elt + 1);
168-
match it.peek_next() {
169-
Some(x) => assert_eq!(*x, *elt + 2),
170-
None => assert_eq!(8, *elt),
171-
}
172-
}
173-
}
174-
}
175-
it.insert_next(0);
176-
it.insert_next(1);
177-
}
178-
check_links(&m);
179-
assert_eq!(m.len(), 3 + len * 2);
180-
assert_eq!(m.into_iter().collect::<Vec<_>>(), [-2, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1]);
181-
}
182-
183156
#[test]
184157
#[cfg_attr(target_os = "emscripten", ignore)]
185158
fn test_send() {

‎src/etc/test-float-parse/runtests.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,12 @@ def interact(proc, queue):
193193

194194
def main():
195195
global MAILBOX
196-
tests = [os.path.splitext(f)[0] for f in glob('*.rs')
197-
if not f.startswith('_')]
196+
all_tests = [os.path.splitext(f)[0] for f in glob('*.rs') if not f.startswith('_')]
198197
args = sys.argv[1:]
199-
tests = [test for test in tests if test in args]
198+
if args:
199+
tests = [test for test in all_tests if test in args]
200+
else
201+
tests = all_tests
200202
if not tests:
201203
print("Error: No tests to run")
202204
sys.exit(1)

‎src/librustc_lint/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ impl ClashingExternDeclarations {
22092209
}
22102210
(Slice(a_ty), Slice(b_ty)) => Self::structurally_same_type(cx, a_ty, b_ty, ckind),
22112211
(RawPtr(a_tymut), RawPtr(b_tymut)) => {
2212-
a_tymut.mutbl == a_tymut.mutbl
2212+
a_tymut.mutbl == b_tymut.mutbl
22132213
&& Self::structurally_same_type(cx, &a_tymut.ty, &b_tymut.ty, ckind)
22142214
}
22152215
(Ref(_a_region, a_ty, a_mut), Ref(_b_region, b_ty, b_mut)) => {

‎src/librustc_mir/interpret/eval_context.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
718718
}
719719
);
720720

721+
if unwinding && self.frame_idx() == 0 {
722+
throw_ub_format!("unwinding past the topmost frame of the stack");
723+
}
724+
721725
::log_settings::settings().indentation -= 1;
722726
let frame =
723727
self.stack_mut().pop().expect("tried to pop a stack frame, but there were none");

‎src/librustc_typeck/variance/constraints.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
161161
self.add_constraints_from_sig(current_item, tcx.fn_sig(def_id), self.covariant);
162162
}
163163

164+
ty::Error(_) => {}
164165
_ => {
165166
span_bug!(
166167
tcx.def_span(def_id),

‎src/test/ui/const-generics/nested-type.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#![feature(const_generics)]
2+
#![allow(incomplete_features)]
3+
4+
struct Foo<const N: [u8; {
5+
//~^ ERROR cycle detected
6+
//~| ERROR cycle detected
7+
struct Foo<const N: usize>;
8+
9+
impl<const N: usize> Foo<N> {
10+
fn value() -> usize {
11+
N
12+
}
13+
}
14+
15+
Foo::<17>::value()
16+
}]>;
17+
18+
fn main() {}

‎src/test/ui/const-generics/nested-type.stderr

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
error[E0391]: cycle detected when computing type of `Foo`
2+
--> $DIR/nested-type.rs:4:1
3+
|
4+
LL | struct Foo<const N: [u8; {
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
note: ...which requires computing type of `Foo::N`...
8+
--> $DIR/nested-type.rs:4:18
9+
|
10+
LL | struct Foo<const N: [u8; {
11+
| ^
12+
note: ...which requires const-evaluating + checking `Foo::{{constant}}#0`...
13+
--> $DIR/nested-type.rs:4:26
14+
|
15+
LL | struct Foo<const N: [u8; {
16+
| __________________________^
17+
LL | |
18+
LL | |
19+
LL | | struct Foo<const N: usize>;
20+
... |
21+
LL | | Foo::<17>::value()
22+
LL | | }]>;
23+
| |_^
24+
note: ...which requires const-evaluating + checking `Foo::{{constant}}#0`...
25+
--> $DIR/nested-type.rs:4:26
26+
|
27+
LL | struct Foo<const N: [u8; {
28+
| __________________________^
29+
LL | |
30+
LL | |
31+
LL | | struct Foo<const N: usize>;
32+
... |
33+
LL | | Foo::<17>::value()
34+
LL | | }]>;
35+
| |_^
36+
note: ...which requires const-evaluating `Foo::{{constant}}#0`...
37+
--> $DIR/nested-type.rs:4:26
38+
|
39+
LL | struct Foo<const N: [u8; {
40+
| __________________________^
41+
LL | |
42+
LL | |
43+
LL | | struct Foo<const N: usize>;
44+
... |
45+
LL | | Foo::<17>::value()
46+
LL | | }]>;
47+
| |_^
48+
note: ...which requires type-checking `Foo::{{constant}}#0`...
49+
--> $DIR/nested-type.rs:4:26
50+
|
51+
LL | struct Foo<const N: [u8; {
52+
| __________________________^
53+
LL | |
54+
LL | |
55+
LL | | struct Foo<const N: usize>;
56+
... |
57+
LL | | Foo::<17>::value()
58+
LL | | }]>;
59+
| |_^
60+
note: ...which requires computing the variances of `Foo::{{constant}}#0::Foo`...
61+
--> $DIR/nested-type.rs:7:5
62+
|
63+
LL | struct Foo<const N: usize>;
64+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
65+
= note: ...which requires computing the variances for items in this crate...
66+
= note: ...which again requires computing type of `Foo`, completing the cycle
67+
note: cycle used when collecting item types in top-level module
68+
--> $DIR/nested-type.rs:1:1
69+
|
70+
LL | / #![feature(const_generics)]
71+
LL | | #![allow(incomplete_features)]
72+
LL | |
73+
LL | | struct Foo<const N: [u8; {
74+
... |
75+
LL | |
76+
LL | | fn main() {}
77+
| |____________^
78+
79+
error[E0391]: cycle detected when computing type of `Foo`
80+
--> $DIR/nested-type.rs:4:1
81+
|
82+
LL | struct Foo<const N: [u8; {
83+
| ^^^^^^^^^^^^^^^^^^^^^^^^
84+
|
85+
note: ...which requires computing type of `Foo::N`...
86+
--> $DIR/nested-type.rs:4:18
87+
|
88+
LL | struct Foo<const N: [u8; {
89+
| ^
90+
note: ...which requires const-evaluating + checking `Foo::{{constant}}#0`...
91+
--> $DIR/nested-type.rs:4:26
92+
|
93+
LL | struct Foo<const N: [u8; {
94+
| __________________________^
95+
LL | |
96+
LL | |
97+
LL | | struct Foo<const N: usize>;
98+
... |
99+
LL | | Foo::<17>::value()
100+
LL | | }]>;
101+
| |_^
102+
note: ...which requires const-evaluating + checking `Foo::{{constant}}#0`...
103+
--> $DIR/nested-type.rs:4:26
104+
|
105+
LL | struct Foo<const N: [u8; {
106+
| __________________________^
107+
LL | |
108+
LL | |
109+
LL | | struct Foo<const N: usize>;
110+
... |
111+
LL | | Foo::<17>::value()
112+
LL | | }]>;
113+
| |_^
114+
note: ...which requires const-evaluating `Foo::{{constant}}#0`...
115+
--> $DIR/nested-type.rs:4:26
116+
|
117+
LL | struct Foo<const N: [u8; {
118+
| __________________________^
119+
LL | |
120+
LL | |
121+
LL | | struct Foo<const N: usize>;
122+
... |
123+
LL | | Foo::<17>::value()
124+
LL | | }]>;
125+
| |_^
126+
note: ...which requires type-checking `Foo::{{constant}}#0`...
127+
--> $DIR/nested-type.rs:4:26
128+
|
129+
LL | struct Foo<const N: [u8; {
130+
| __________________________^
131+
LL | |
132+
LL | |
133+
LL | | struct Foo<const N: usize>;
134+
... |
135+
LL | | Foo::<17>::value()
136+
LL | | }]>;
137+
| |_^
138+
note: ...which requires computing the variances of `Foo::{{constant}}#0::Foo`...
139+
--> $DIR/nested-type.rs:7:5
140+
|
141+
LL | struct Foo<const N: usize>;
142+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
143+
= note: ...which requires computing the variances for items in this crate...
144+
= note: ...which again requires computing type of `Foo`, completing the cycle
145+
note: cycle used when collecting item types in top-level module
146+
--> $DIR/nested-type.rs:1:1
147+
|
148+
LL | / #![feature(const_generics)]
149+
LL | | #![allow(incomplete_features)]
150+
LL | |
151+
LL | | struct Foo<const N: [u8; {
152+
... |
153+
LL | |
154+
LL | | fn main() {}
155+
| |____________^
156+
157+
error: aborting due to 2 previous errors
158+
159+
For more information about this error, try `rustc --explain E0391`.

0 commit comments

Comments
 (0)