about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-04-22 18:17:23 +0000
committerbors <bors@rust-lang.org>2021-04-22 18:17:23 +0000
commit5f1aeb52c22e3784928765e34be6dc0d17a350b4 (patch)
tree7852b8984f156016a1645303378df9b4fac9399c /src
parentccf171242bb00dd17ac4b844e6afe77fabd04b78 (diff)
parentd1f5fc601770b7d579904c5b8fe554b184587b66 (diff)
downloadrust-5f1aeb52c22e3784928765e34be6dc0d17a350b4.tar.gz
rust-5f1aeb52c22e3784928765e34be6dc0d17a350b4.zip
Auto merge of #84440 - Dylan-DPC:rollup-0xjb8oi, r=Dylan-DPC
Rollup of 7 pull requests

Successful merges:

 - #84343 (Remove `ScopeTree::closure_tree`)
 - #84376 (Uses flex to fix formatting of h1 at any width)
 - #84377 (Followup to #83944)
 - #84396 (Update LLVM submodule)
 - #84402 (Move `sys_common::rwlock::StaticRWLock` etc. to `sys::unix::rwlock`)
 - #84404 (Check for intrinsics before coercing to a function pointer)
 - #84413 (Remove `sys::args::Args::inner_debug` and use `Debug` instead)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/html/static/rustdoc.css13
m---------src/llvm-project0
-rw-r--r--src/test/ui/reify-intrinsic.rs8
-rw-r--r--src/test/ui/reify-intrinsic.stderr11
4 files changed, 27 insertions, 5 deletions
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index 8f11dda2fb2..213ca9ec9e3 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -116,6 +116,8 @@ h4:not(.method):not(.type):not(.tymethod):not(.associatedconstant) {
 	padding-bottom: 6px;
 }
 h1.fqn {
+	display: flex;
+	width: 100%;
 	border-bottom: 1px dashed;
 	margin-top: 0;
 }
@@ -458,6 +460,13 @@ nav.sub {
 	font-weight: normal;
 }
 
+h1.fqn > .out-of-band {
+	float: unset;
+	flex: 1;
+	text-align: right;
+	margin-left: 8px;
+}
+
 h3.impl > .out-of-band {
 	font-size: 21px;
 }
@@ -1450,10 +1459,6 @@ h4 > .notable-traits {
 		padding: 0;
 	}
 
-	.content .in-band {
-		width: 100%;
-	}
-
 	.content h4 > .out-of-band {
 		position: inherit;
 	}
diff --git a/src/llvm-project b/src/llvm-project
-Subproject ea6bb2615f04d53db11b6a43a14be5c9d1eaebe
+Subproject 0ed6038a318e34e3d76a9e55bdebc4cfd17f902
diff --git a/src/test/ui/reify-intrinsic.rs b/src/test/ui/reify-intrinsic.rs
index 09baa059e55..05535b92cca 100644
--- a/src/test/ui/reify-intrinsic.rs
+++ b/src/test/ui/reify-intrinsic.rs
@@ -12,4 +12,12 @@ fn b() {
     //~^ ERROR casting
 }
 
+fn c() {
+    let _ = [
+        std::intrinsics::copy_nonoverlapping::<i32>,
+        std::intrinsics::copy::<i32>,
+        //~^ ERROR cannot coerce
+    ];
+}
+
 fn main() {}
diff --git a/src/test/ui/reify-intrinsic.stderr b/src/test/ui/reify-intrinsic.stderr
index 675447f9721..5d82fdbd311 100644
--- a/src/test/ui/reify-intrinsic.stderr
+++ b/src/test/ui/reify-intrinsic.stderr
@@ -19,7 +19,16 @@ error[E0606]: casting `unsafe extern "rust-intrinsic" fn(_) -> _ {transmute::<_,
 LL |     let _ = std::mem::transmute as unsafe extern "rust-intrinsic" fn(isize) -> usize;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 2 previous errors
+error[E0308]: cannot coerce intrinsics to function pointers
+  --> $DIR/reify-intrinsic.rs:18:9
+   |
+LL |         std::intrinsics::copy::<i32>,
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot coerce intrinsics to function pointers
+   |
+   = note: expected type `unsafe extern "rust-intrinsic" fn(_, _, _) {copy_nonoverlapping::<i32>}`
+           found fn item `unsafe extern "rust-intrinsic" fn(_, _, _) {std::intrinsics::copy::<i32>}`
+
+error: aborting due to 3 previous errors
 
 Some errors have detailed explanations: E0308, E0606.
 For more information about an error, try `rustc --explain E0308`.