Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit b979e1e

Browse files
authored
Rollup merge of #148994 - folkertdev:abi-compatibility-cleanup, r=jieyouxu
Abi compatibility test cleanup r? `@jieyouxu` - moves `NonNull` (and some friends) into `minicore.rs` so it can be re-used. - tests the abi compatibility of a couple more targets. It's useful to have a comprehensive overview of all ABIs that rust has some amount of support for, e.g. testing for c-variadic or guaranteed tail calls (cc #148748)
2 parents 08093e7 + 96c6427 commit b979e1e

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎tests/auxiliary/minicore.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ pub struct ManuallyDrop<T: PointeeSized> {
119119
}
120120
impl<T:Copy + PointeeSized>CopyforManuallyDrop<T>{}
121121

122+
#[repr(transparent)]
123+
#[rustc_layout_scalar_valid_range_start(1)]
124+
#[rustc_nonnull_optimization_guaranteed]
125+
pubstructNonNull<T: ?Sized>{
126+
pointer:*constT,
127+
}
128+
impl<T: ?Sized>CopyforNonNull<T>{}
129+
130+
#[repr(transparent)]
131+
#[rustc_layout_scalar_valid_range_start(1)]
132+
#[rustc_nonnull_optimization_guaranteed]
133+
pubstructNonZero<T>(T);
134+
135+
pubstructUnique<T: ?Sized>{
136+
pubpointer:NonNull<T>,
137+
pub_marker:PhantomData<T>,
138+
}
139+
122140
#[lang = "unsafe_cell"]
123141
#[repr(transparent)]
124142
pubstructUnsafeCell<T:PointeeSized>{

‎tests/ui/abi/compatibility.rs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
//@ revisions: arm
1414
//@[arm] compile-flags: --target arm-unknown-linux-gnueabi
1515
//@[arm] needs-llvm-components: arm
16+
//@ revisions: thumb
17+
//@[thumb] compile-flags: --target thumbv8m.main-none-eabi
18+
//@[thumb] needs-llvm-components: arm
1619
//@ revisions: aarch64
1720
//@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu
1821
//@[aarch64] needs-llvm-components: aarch64
@@ -31,12 +34,21 @@
3134
//@ revisions: sparc64
3235
//@[sparc64] compile-flags: --target sparc64-unknown-linux-gnu
3336
//@[sparc64] needs-llvm-components: sparc
37+
//@ revisions: powerpc
38+
//@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu
39+
//@[powerpc] needs-llvm-components: powerpc
3440
//@ revisions: powerpc64
3541
//@[powerpc64] compile-flags: --target powerpc64-unknown-linux-gnu
3642
//@[powerpc64] needs-llvm-components: powerpc
43+
//@ revisions: aix
44+
//@[aix] compile-flags: --target powerpc64-ibm-aix
45+
//@[aix] needs-llvm-components: powerpc
3746
//@ revisions: riscv
3847
//@[riscv] compile-flags: --target riscv64gc-unknown-linux-gnu
3948
//@[riscv] needs-llvm-components: riscv
49+
//@ revisions: loongarch32
50+
//@[loongarch32] compile-flags: --target loongarch32-unknown-none
51+
//@[loongarch32] needs-llvm-components: loongarch
4052
//@ revisions: loongarch64
4153
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
4254
//@[loongarch64] needs-llvm-components: loongarch
@@ -87,31 +99,13 @@ mod prelude {
8799
fnclone(&self) -> Self;
88100
}
89101

90-
#[repr(transparent)]
91-
#[rustc_layout_scalar_valid_range_start(1)]
92-
#[rustc_nonnull_optimization_guaranteed]
93-
pubstructNonNull<T: ?Sized>{
94-
pointer:*constT,
95-
}
96-
impl<T: ?Sized>CopyforNonNull<T>{}
97-
98-
#[repr(transparent)]
99-
#[rustc_layout_scalar_valid_range_start(1)]
100-
#[rustc_nonnull_optimization_guaranteed]
101-
pubstructNonZero<T>(T);
102-
103102
// This just stands in for a non-trivial type.
104103
pubstructVec<T>{
105104
ptr:NonNull<T>,
106105
cap:usize,
107106
len:usize,
108107
}
109108

110-
pubstructUnique<T: ?Sized>{
111-
pubpointer:NonNull<T>,
112-
pub_marker:PhantomData<T>,
113-
}
114-
115109
#[lang = "global_alloc_ty"]
116110
pubstructGlobal;
117111

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ async unsafe extern "cmse-nonsecure-entry" fn async_is_not_allowed() {
3131
// this file, but they may be moved into `minicore` if/when other `#[no_core]` tests want to use
3232
// them.
3333

34-
// NOTE: in `core` this type uses `NonNull`.
3534
#[lang = "ResumeTy"]
36-
pubstructResumeTy(*mutContext<'static>);
35+
pubstructResumeTy(NonNull<Context<'static>>);
3736

3837
#[lang = "future_trait"]
3938
pubtraitFuture{

0 commit comments

Comments
 (0)