Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit aea21fe

Browse files
committed
Auto merge of rust-lang#94895 - matthiaskrgr:rollup-9hue5qk, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#94867 (Add regression test for `<i32 as Iterator>::count`) - rust-lang#94886 (Update browser-ui-test version used in CI) - rust-lang#94894 (Remove needless use of `Into`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents bbbd48f + 7d456f7 commit aea21fe

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
7272
# https://github.com/puppeteer/puppeteer/issues/375
7373
#
7474
# We also specify the version in case we need to update it to go around cache limitations.
75-
RUN npm install -g [email protected].0 --unsafe-perm=true
75+
RUN npm install -g [email protected].1 --unsafe-perm=true
7676

7777
ENV RUST_CONFIGURE_ARGS \
7878
--build=x86_64-unknown-linux-gnu \

src/librustdoc/clean/inline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ fn merge_attrs(
327327
/// Inline an `impl`, inherent or of a trait. The `did` must be for an `impl`.
328328
crate fn build_impl(
329329
cx: &mut DocContext<'_>,
330-
parent_module: impl Into<Option<DefId>>,
330+
parent_module: Option<DefId>,
331331
did: DefId,
332332
attrs: Option<Attrs<'_>>,
333333
ret: &mut Vec<clean::Item>,
@@ -478,7 +478,7 @@ crate fn build_impl(
478478
record_extern_trait(cx, did);
479479
}
480480

481-
let (merged_attrs, cfg) = merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
481+
let (merged_attrs, cfg) = merge_attrs(cx, parent_module, load_attrs(cx, did), attrs);
482482
trace!("merged_attrs={:?}", merged_attrs);
483483

484484
trace!(
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
fn main() {
2+
let x: i32 = 1;
3+
println!("{:?}", x.count()); //~ ERROR is not an iterator
4+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error[E0599]: `i32` is not an iterator
2+
--> $DIR/issue-84495.rs:3:24
3+
|
4+
LL | println!("{:?}", x.count());
5+
| ^^^^^ `i32` is not an iterator
6+
|
7+
= note: the following trait bounds were not satisfied:
8+
`i32: Iterator`
9+
which is required by `&mut i32: Iterator`
10+
11+
error: aborting due to previous error
12+
13+
For more information about this error, try `rustc --explain E0599`.

0 commit comments

Comments
 (0)