if !up_to_date(Path::new("build.rs"), ×tamp) || !up_to_date(src_dir, ×tamp) {
Ok(NativeLibBoilerplate {
src_dir: src_dir.to_path_buf(),
- out_dir: out_dir,
+ out_dir,
})
} else {
Err(())
impl Ord for $t {
#[inline]
fn cmp(&self, other: &$t) -> Ordering {
- if *self == *other { Equal }
- else if *self < *other { Less }
- else { Greater }
+ // The order here is important to generate more optimal assembly.
+ // See <https://github.com/rust-lang/rust/issues/63758> for more info.
+ if *self < *other { Less }
+ else if *self > *other { Greater }
+ else { Equal }
}
}
)*)
Self: Sized, F: FnMut(B, Self::Item) -> R, R: Try<Ok=B>
{
match self.peeked.take() {
- Some(None) => return Try::from_ok(init),
+ Some(None) => Try::from_ok(init),
Some(Some(v)) => match self.iter.try_rfold(init, &mut f).into_result() {
Ok(acc) => f(acc, v),
Err(e) => {
where Fold: FnMut(Acc, Self::Item) -> Acc,
{
match self.peeked {
- Some(None) => return init,
+ Some(None) => init,
Some(Some(v)) => {
let acc = self.iter.rfold(init, &mut fold);
fold(acc, v)
if size == 0 {
// This _cannot_ use `unchecked_sub` because we depend on wrapping
// to represent the length of long ZST slice iterators.
- let diff = ($self.end as usize).wrapping_sub(start as usize);
- diff
+ ($self.end as usize).wrapping_sub(start as usize)
} else {
// We know that `start <= end`, so can do better than `offset_from`,
// which needs to deal in signed. By setting appropriate flags here
&self.forest.krate.attrs
}
- pub fn get_module(&self, module: DefId) -> (&'hir Mod, Span, HirId)
- {
+ pub fn get_module(&self, module: DefId) -> (&'hir Mod, Span, HirId) {
let hir_id = self.as_local_hir_id(module).unwrap();
self.read(hir_id);
match self.find_entry(hir_id).unwrap().node {
..
}) => (m, span, hir_id),
Node::Crate => (&self.forest.krate.module, self.forest.krate.span, hir_id),
- _ => panic!("not a module")
+ node => panic!("not a module: {:?}", node),
}
}
}
}
+ /// Wether `hir_id` corresponds to a `mod` or a crate.
+ pub fn is_hir_id_module(&self, hir_id: HirId) -> bool {
+ match self.lookup(hir_id) {
+ Some(Entry { node: Node::Item(Item { node: ItemKind::Mod(_), .. }), .. }) |
+ Some(Entry { node: Node::Crate, .. }) => true,
+ _ => false,
+ }
+ }
+
+
/// If there is some error when walking the parents (e.g., a node does not
/// have a parent in the map or a node can't be found), then we return the
/// last good `HirId` we found. Note that reaching the crate root (`id == 0`),
hir::MatchSource::IfLetDesugar { .. } => "`if let` arms have compatible types",
_ => "match arms have compatible types",
},
- IfExpression { .. } => "if and else have compatible types",
+ IfExpression { .. } => "if and else have incompatible types",
IfExpressionWithNoElse => "if missing an else returns ()",
MainFunctionType => "`main` function has the correct type",
StartFunctionType => "`start` function has the correct type",
}
impl<'tcx> TyCtxt<'tcx> {
- pub fn note_and_explain_type_err(self,
- db: &mut DiagnosticBuilder<'_>,
- err: &TypeError<'tcx>,
- sp: Span) {
+ pub fn note_and_explain_type_err(
+ self,
+ db: &mut DiagnosticBuilder<'_>,
+ err: &TypeError<'tcx>,
+ sp: Span,
+ ) {
use self::TypeError::*;
- match err.clone() {
+ match err {
Sorts(values) => {
let expected_str = values.expected.sort_string(self);
let found_str = values.found.sort_string(self);
db.note("no two closures, even if identical, have the same type");
db.help("consider boxing your closure and/or using it as a trait object");
}
+ if expected_str == found_str && expected_str == "opaque type" { // Issue #63167
+ db.note("distinct uses of `impl Trait` result in different opaque types");
+ let e_str = values.expected.to_string();
+ let f_str = values.found.to_string();
+ if &e_str == &f_str && &e_str == "impl std::future::Future" {
+ // FIXME: use non-string based check.
+ db.help("if both `Future`s have the same `Output` type, consider \
+ `.await`ing on both of them");
+ }
+ }
if let (ty::Infer(ty::IntVar(_)), ty::Float(_)) =
(&values.found.sty, &values.expected.sty) // Issue #53280
{
}
}
- fn update_macro_reachable_mod(
- &mut self,
- reachable_mod: hir::HirId,
- defining_mod: DefId,
- ) {
+ fn update_macro_reachable_mod(&mut self, reachable_mod: hir::HirId, defining_mod: DefId) {
let module_def_id = self.tcx.hir().local_def_id(reachable_mod);
let module = self.tcx.hir().get_module(module_def_id).0;
for item_id in &module.item_ids {
self.update_macro_reachable_def(hir_id, def_kind, vis, defining_mod);
}
}
-
if let Some(exports) = self.tcx.module_exports(module_def_id) {
for export in exports {
if export.vis.is_accessible_from(defining_mod, self.tcx) {
if let Res::Def(def_kind, def_id) = export.res {
let vis = def_id_visibility(self.tcx, def_id).0;
if let Some(hir_id) = self.tcx.hir().as_local_hir_id(def_id) {
- self.update_macro_reachable_def(
- hir_id,
- def_kind,
- vis,
- defining_mod,
- );
+ self.update_macro_reachable_def(hir_id, def_kind, vis, defining_mod);
}
}
}
self.tcx.hir().local_def_id(md.hir_id)
).unwrap();
let mut module_id = self.tcx.hir().as_local_hir_id(macro_module_def_id).unwrap();
+ if !self.tcx.hir().is_hir_id_module(module_id) {
+ // `module_id` doesn't correspond to a `mod`, return early (#63164).
+ return;
+ }
let level = if md.vis.node.is_pub() { self.get(module_id) } else { None };
let new_level = self.update(md.hir_id, level);
if new_level.is_none() {
- return
+ return;
}
loop {
var themePicker = document.getElementById("theme-picker");
function showThemeButtonState() {{
- themes.style.display = "none";
- themePicker.style.borderBottomRightRadius = "3px";
- themePicker.style.borderBottomLeftRadius = "3px";
-}}
-
-function hideThemeButtonState() {{
themes.style.display = "block";
themePicker.style.borderBottomRightRadius = "0";
themePicker.style.borderBottomLeftRadius = "0";
}}
+function hideThemeButtonState() {{
+ themes.style.display = "none";
+ themePicker.style.borderBottomRightRadius = "3px";
+ themePicker.style.borderBottomLeftRadius = "3px";
+}}
+
function switchThemeButtonState() {{
if (themes.style.display === "block") {{
- showThemeButtonState();
- }} else {{
hideThemeButtonState();
+ }} else {{
+ showThemeButtonState();
}}
}};
sidebar.appendChild(div);
}
}
- var themePicker = document.getElementsByClassName("theme-picker");
- if (themePicker && themePicker.length > 0) {
- themePicker[0].style.display = "none";
+ var themePickers = document.getElementsByClassName("theme-picker");
+ if (themePickers && themePickers.length > 0) {
+ themePickers[0].style.display = "none";
}
}
filler.remove();
}
document.getElementsByTagName("body")[0].style.marginTop = "";
- var themePicker = document.getElementsByClassName("theme-picker");
- if (themePicker && themePicker.length > 0) {
- themePicker[0].style.display = null;
+ var themePickers = document.getElementsByClassName("theme-picker");
+ if (themePickers && themePickers.length > 0) {
+ themePickers[0].style.display = null;
}
}
--- /dev/null
+// This is test for more optimal Ord implementation for integers.
+// See <https://github.com/rust-lang/rust/issues/63758> for more info.
+
+// compile-flags: -C opt-level=3
+
+#![crate_type = "lib"]
+
+use std::cmp::Ordering;
+
+// CHECK-LABEL: @cmp_signed
+#[no_mangle]
+pub fn cmp_signed(a: i64, b: i64) -> Ordering {
+// CHECK: icmp slt
+// CHECK: icmp sgt
+// CHECK: zext i1
+// CHECK: select i1
+ a.cmp(&b)
+}
+
+// CHECK-LABEL: @cmp_unsigned
+#[no_mangle]
+pub fn cmp_unsigned(a: u32, b: u32) -> Ordering {
+// CHECK: icmp ult
+// CHECK: icmp ugt
+// CHECK: zext i1
+// CHECK: select i1
+ a.cmp(&b)
+}
--- /dev/null
+// run-pass
+#![feature(decl_macro)]
+
+pub fn moo() {
+ pub macro ABC() {{}}
+}
+
+fn main() {}
--- /dev/null
+#![feature(core_intrinsics)]
+#![allow(warnings)]
+#![crate_type = "rlib"]
+
+use std::intrinsics;
+
+#[derive(Copy, Clone)]
+pub struct Foo(i64);
+pub type Bar = &'static Fn();
+pub type Quux = [u8; 100];
+
+pub unsafe fn test_bool_load(p: &mut bool, v: bool) {
+ intrinsics::atomic_load(p);
+ //~^ ERROR `atomic_load` intrinsic: expected basic integer type, found `bool`
+}
+
+pub unsafe fn test_bool_store(p: &mut bool, v: bool) {
+ intrinsics::atomic_store(p, v);
+ //~^ ERROR `atomic_store` intrinsic: expected basic integer type, found `bool`
+}
+
+pub unsafe fn test_bool_xchg(p: &mut bool, v: bool) {
+ intrinsics::atomic_xchg(p, v);
+ //~^ ERROR `atomic_xchg` intrinsic: expected basic integer type, found `bool`
+}
+
+pub unsafe fn test_bool_cxchg(p: &mut bool, v: bool) {
+ intrinsics::atomic_cxchg(p, v, v);
+ //~^ ERROR `atomic_cxchg` intrinsic: expected basic integer type, found `bool`
+}
+
+pub unsafe fn test_Foo_load(p: &mut Foo, v: Foo) {
+ intrinsics::atomic_load(p);
+ //~^ ERROR `atomic_load` intrinsic: expected basic integer type, found `Foo`
+}
+
+pub unsafe fn test_Foo_store(p: &mut Foo, v: Foo) {
+ intrinsics::atomic_store(p, v);
+ //~^ ERROR `atomic_store` intrinsic: expected basic integer type, found `Foo`
+}
+
+pub unsafe fn test_Foo_xchg(p: &mut Foo, v: Foo) {
+ intrinsics::atomic_xchg(p, v);
+ //~^ ERROR `atomic_xchg` intrinsic: expected basic integer type, found `Foo`
+}
+
+pub unsafe fn test_Foo_cxchg(p: &mut Foo, v: Foo) {
+ intrinsics::atomic_cxchg(p, v, v);
+ //~^ ERROR `atomic_cxchg` intrinsic: expected basic integer type, found `Foo`
+}
+
+pub unsafe fn test_Bar_load(p: &mut Bar, v: Bar) {
+ intrinsics::atomic_load(p);
+ //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
+}
+
+pub unsafe fn test_Bar_store(p: &mut Bar, v: Bar) {
+ intrinsics::atomic_store(p, v);
+ //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
+}
+
+pub unsafe fn test_Bar_xchg(p: &mut Bar, v: Bar) {
+ intrinsics::atomic_xchg(p, v);
+ //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
+}
+
+pub unsafe fn test_Bar_cxchg(p: &mut Bar, v: Bar) {
+ intrinsics::atomic_cxchg(p, v, v);
+ //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
+}
+
+pub unsafe fn test_Quux_load(p: &mut Quux, v: Quux) {
+ intrinsics::atomic_load(p);
+ //~^ ERROR `atomic_load` intrinsic: expected basic integer type, found `[u8; 100]`
+}
+
+pub unsafe fn test_Quux_store(p: &mut Quux, v: Quux) {
+ intrinsics::atomic_store(p, v);
+ //~^ ERROR `atomic_store` intrinsic: expected basic integer type, found `[u8; 100]`
+}
+
+pub unsafe fn test_Quux_xchg(p: &mut Quux, v: Quux) {
+ intrinsics::atomic_xchg(p, v);
+ //~^ ERROR `atomic_xchg` intrinsic: expected basic integer type, found `[u8; 100]`
+}
+
+pub unsafe fn test_Quux_cxchg(p: &mut Quux, v: Quux) {
+ intrinsics::atomic_cxchg(p, v, v);
+ //~^ ERROR `atomic_cxchg` intrinsic: expected basic integer type, found `[u8; 100]`
+}
--- /dev/null
+error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `bool`
+ --> $DIR/non-integer-atomic.rs:13:5
+ |
+LL | intrinsics::atomic_load(p);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `bool`
+ --> $DIR/non-integer-atomic.rs:18:5
+ |
+LL | intrinsics::atomic_store(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `bool`
+ --> $DIR/non-integer-atomic.rs:23:5
+ |
+LL | intrinsics::atomic_xchg(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `bool`
+ --> $DIR/non-integer-atomic.rs:28:5
+ |
+LL | intrinsics::atomic_cxchg(p, v, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `Foo`
+ --> $DIR/non-integer-atomic.rs:33:5
+ |
+LL | intrinsics::atomic_load(p);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `Foo`
+ --> $DIR/non-integer-atomic.rs:38:5
+ |
+LL | intrinsics::atomic_store(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `Foo`
+ --> $DIR/non-integer-atomic.rs:43:5
+ |
+LL | intrinsics::atomic_xchg(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `Foo`
+ --> $DIR/non-integer-atomic.rs:48:5
+ |
+LL | intrinsics::atomic_cxchg(p, v, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
+ --> $DIR/non-integer-atomic.rs:53:5
+ |
+LL | intrinsics::atomic_load(p);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
+ --> $DIR/non-integer-atomic.rs:58:5
+ |
+LL | intrinsics::atomic_store(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
+ --> $DIR/non-integer-atomic.rs:63:5
+ |
+LL | intrinsics::atomic_xchg(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
+ --> $DIR/non-integer-atomic.rs:68:5
+ |
+LL | intrinsics::atomic_cxchg(p, v, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `[u8; 100]`
+ --> $DIR/non-integer-atomic.rs:73:5
+ |
+LL | intrinsics::atomic_load(p);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `[u8; 100]`
+ --> $DIR/non-integer-atomic.rs:78:5
+ |
+LL | intrinsics::atomic_store(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `[u8; 100]`
+ --> $DIR/non-integer-atomic.rs:83:5
+ |
+LL | intrinsics::atomic_xchg(p, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `[u8; 100]`
+ --> $DIR/non-integer-atomic.rs:88:5
+ |
+LL | intrinsics::atomic_cxchg(p, v, v);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 16 previous errors
+
+++ /dev/null
-#![feature(core_intrinsics)]
-#![allow(warnings)]
-#![crate_type = "rlib"]
-
-use std::intrinsics;
-
-#[derive(Copy, Clone)]
-pub struct Foo(i64);
-pub type Bar = &'static Fn();
-pub type Quux = [u8; 100];
-
-pub unsafe fn test_bool_load(p: &mut bool, v: bool) {
- intrinsics::atomic_load(p);
- //~^ ERROR `atomic_load` intrinsic: expected basic integer type, found `bool`
-}
-
-pub unsafe fn test_bool_store(p: &mut bool, v: bool) {
- intrinsics::atomic_store(p, v);
- //~^ ERROR `atomic_store` intrinsic: expected basic integer type, found `bool`
-}
-
-pub unsafe fn test_bool_xchg(p: &mut bool, v: bool) {
- intrinsics::atomic_xchg(p, v);
- //~^ ERROR `atomic_xchg` intrinsic: expected basic integer type, found `bool`
-}
-
-pub unsafe fn test_bool_cxchg(p: &mut bool, v: bool) {
- intrinsics::atomic_cxchg(p, v, v);
- //~^ ERROR `atomic_cxchg` intrinsic: expected basic integer type, found `bool`
-}
-
-pub unsafe fn test_Foo_load(p: &mut Foo, v: Foo) {
- intrinsics::atomic_load(p);
- //~^ ERROR `atomic_load` intrinsic: expected basic integer type, found `Foo`
-}
-
-pub unsafe fn test_Foo_store(p: &mut Foo, v: Foo) {
- intrinsics::atomic_store(p, v);
- //~^ ERROR `atomic_store` intrinsic: expected basic integer type, found `Foo`
-}
-
-pub unsafe fn test_Foo_xchg(p: &mut Foo, v: Foo) {
- intrinsics::atomic_xchg(p, v);
- //~^ ERROR `atomic_xchg` intrinsic: expected basic integer type, found `Foo`
-}
-
-pub unsafe fn test_Foo_cxchg(p: &mut Foo, v: Foo) {
- intrinsics::atomic_cxchg(p, v, v);
- //~^ ERROR `atomic_cxchg` intrinsic: expected basic integer type, found `Foo`
-}
-
-pub unsafe fn test_Bar_load(p: &mut Bar, v: Bar) {
- intrinsics::atomic_load(p);
- //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
-}
-
-pub unsafe fn test_Bar_store(p: &mut Bar, v: Bar) {
- intrinsics::atomic_store(p, v);
- //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
-}
-
-pub unsafe fn test_Bar_xchg(p: &mut Bar, v: Bar) {
- intrinsics::atomic_xchg(p, v);
- //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
-}
-
-pub unsafe fn test_Bar_cxchg(p: &mut Bar, v: Bar) {
- intrinsics::atomic_cxchg(p, v, v);
- //~^ ERROR expected basic integer type, found `&dyn std::ops::Fn()`
-}
-
-pub unsafe fn test_Quux_load(p: &mut Quux, v: Quux) {
- intrinsics::atomic_load(p);
- //~^ ERROR `atomic_load` intrinsic: expected basic integer type, found `[u8; 100]`
-}
-
-pub unsafe fn test_Quux_store(p: &mut Quux, v: Quux) {
- intrinsics::atomic_store(p, v);
- //~^ ERROR `atomic_store` intrinsic: expected basic integer type, found `[u8; 100]`
-}
-
-pub unsafe fn test_Quux_xchg(p: &mut Quux, v: Quux) {
- intrinsics::atomic_xchg(p, v);
- //~^ ERROR `atomic_xchg` intrinsic: expected basic integer type, found `[u8; 100]`
-}
-
-pub unsafe fn test_Quux_cxchg(p: &mut Quux, v: Quux) {
- intrinsics::atomic_cxchg(p, v, v);
- //~^ ERROR `atomic_cxchg` intrinsic: expected basic integer type, found `[u8; 100]`
-}
+++ /dev/null
-error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `bool`
- --> $DIR/non-interger-atomic.rs:13:5
- |
-LL | intrinsics::atomic_load(p);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `bool`
- --> $DIR/non-interger-atomic.rs:18:5
- |
-LL | intrinsics::atomic_store(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `bool`
- --> $DIR/non-interger-atomic.rs:23:5
- |
-LL | intrinsics::atomic_xchg(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `bool`
- --> $DIR/non-interger-atomic.rs:28:5
- |
-LL | intrinsics::atomic_cxchg(p, v, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `Foo`
- --> $DIR/non-interger-atomic.rs:33:5
- |
-LL | intrinsics::atomic_load(p);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `Foo`
- --> $DIR/non-interger-atomic.rs:38:5
- |
-LL | intrinsics::atomic_store(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `Foo`
- --> $DIR/non-interger-atomic.rs:43:5
- |
-LL | intrinsics::atomic_xchg(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `Foo`
- --> $DIR/non-interger-atomic.rs:48:5
- |
-LL | intrinsics::atomic_cxchg(p, v, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
- --> $DIR/non-interger-atomic.rs:53:5
- |
-LL | intrinsics::atomic_load(p);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
- --> $DIR/non-interger-atomic.rs:58:5
- |
-LL | intrinsics::atomic_store(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
- --> $DIR/non-interger-atomic.rs:63:5
- |
-LL | intrinsics::atomic_xchg(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()`
- --> $DIR/non-interger-atomic.rs:68:5
- |
-LL | intrinsics::atomic_cxchg(p, v, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `[u8; 100]`
- --> $DIR/non-interger-atomic.rs:73:5
- |
-LL | intrinsics::atomic_load(p);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `[u8; 100]`
- --> $DIR/non-interger-atomic.rs:78:5
- |
-LL | intrinsics::atomic_store(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `[u8; 100]`
- --> $DIR/non-interger-atomic.rs:83:5
- |
-LL | intrinsics::atomic_xchg(p, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `[u8; 100]`
- --> $DIR/non-interger-atomic.rs:88:5
- |
-LL | intrinsics::atomic_cxchg(p, v, v);
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 16 previous errors
-
--- /dev/null
+// edition:2018
+use core::future::Future;
+
+async fn base_thing() -> Result<(), ()> {
+ Ok(())
+}
+
+fn thing_one() -> impl Future<Output = Result<(), ()>> {
+ base_thing()
+}
+
+fn thing_two() -> impl Future<Output = Result<(), ()>> {
+ base_thing()
+}
+
+async fn thing() -> Result<(), ()> {
+ if true {
+ thing_one()
+ } else {
+ thing_two() //~ ERROR if and else have incompatible types
+ }.await
+}
+
+fn main() {}
--- /dev/null
+error[E0308]: if and else have incompatible types
+ --> $DIR/opaque-type-error.rs:20:9
+ |
+LL | / if true {
+LL | | thing_one()
+ | | ----------- expected because of this
+LL | | } else {
+LL | | thing_two()
+ | | ^^^^^^^^^^^ expected opaque type, found a different opaque type
+LL | | }.await
+ | |_____- if and else have incompatible types
+ |
+ = note: expected type `impl std::future::Future` (opaque type)
+ found type `impl std::future::Future` (opaque type)
+ = note: distinct uses of `impl Trait` result in different opaque types
+ = help: if both `Future`s have the same `Output` type, consider `.await`ing on both of them
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
'@ryankurte @thejpster @therealprof'
),
'edition-guide': '@ehuss @Centril @steveklabnik',
- 'rustc-guide': '@mark-i-m @spastorino'
+ 'rustc-guide': '@mark-i-m @spastorino @amanjeev'
}
REPOS = {
projects / rust.git / commitdiff