提交 aea21fee 编写于 作者: B bors

Auto merge of #94895 - matthiaskrgr:rollup-9hue5qk, r=matthiaskrgr

Rollup of 3 pull requests

Successful merges:

 - #94867 (Add regression test for `<i32 as Iterator>::count`)
 - #94886 (Update browser-ui-test version used in CI)
 - #94894 (Remove needless use of `Into`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
......@@ -72,7 +72,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
# https://github.com/puppeteer/puppeteer/issues/375
#
# We also specify the version in case we need to update it to go around cache limitations.
RUN npm install -g browser-ui-test@0.8.0 --unsafe-perm=true
RUN npm install -g browser-ui-test@0.8.1 --unsafe-perm=true
ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
......
......@@ -327,7 +327,7 @@ fn merge_attrs(
/// Inline an `impl`, inherent or of a trait. The `did` must be for an `impl`.
crate fn build_impl(
cx: &mut DocContext<'_>,
parent_module: impl Into<Option<DefId>>,
parent_module: Option<DefId>,
did: DefId,
attrs: Option<Attrs<'_>>,
ret: &mut Vec<clean::Item>,
......@@ -478,7 +478,7 @@ fn merge_attrs(
record_extern_trait(cx, did);
}
let (merged_attrs, cfg) = merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
let (merged_attrs, cfg) = merge_attrs(cx, parent_module, load_attrs(cx, did), attrs);
trace!("merged_attrs={:?}", merged_attrs);
trace!(
......
fn main() {
let x: i32 = 1;
println!("{:?}", x.count()); //~ ERROR is not an iterator
}
error[E0599]: `i32` is not an iterator
--> $DIR/issue-84495.rs:3:24
|
LL | println!("{:?}", x.count());
| ^^^^^ `i32` is not an iterator
|
= note: the following trait bounds were not satisfied:
`i32: Iterator`
which is required by `&mut i32: Iterator`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0599`.
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册