Skip to content

Commit 657540f

Browse files
authored
Merge pull request #1390 from google/nightly-feature
Convert to arbitrary_self_types_pointers.
2 parents 6a54d7c + ee3b356 commit 657540f

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ exclude = [ ".github", "book", "tools" ]
2525
resolver = "2"
2626

2727
[features]
28-
arbitrary_self_types = []
28+
arbitrary_self_types_pointers = []
2929

3030
[dependencies]
3131
autocxx-macro = { path="macro", version="0.27.0" }

examples/reference-wrappers/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
// Necessary to be able to call methods on reference wrappers.
2727
// For that reason, this example only builds on nightly Rust.
28-
#![feature(arbitrary_self_types)]
28+
#![feature(arbitrary_self_types_pointers)]
2929

3030
use autocxx::prelude::*;
3131
use std::pin::Pin;

integration-tests/tests/cpprefs_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn run_cpprefs_test(
2626
generate_pods: &[&str],
2727
) {
2828
if !arbitrary_self_types_supported() {
29-
// "unsafe_references_wrapped" requires arbitrary_self_types, which requires nightly.
29+
// "unsafe_references_wrapped" requires arbitrary_self_types_pointers, which requires nightly.
3030
return;
3131
}
3232
do_run_test(
@@ -39,7 +39,7 @@ fn run_cpprefs_test(
3939
None,
4040
"unsafe_references_wrapped",
4141
Some(quote! {
42-
#![feature(arbitrary_self_types)]
42+
#![feature(arbitrary_self_types_pointers)]
4343
}),
4444
)
4545
.unwrap()

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ macro_rules! concrete {
270270
/// them to be wrapped in a `CppRef` type: see [`CppRef`].
271271
/// This only works on nightly Rust because it
272272
/// depends upon an unstable feature
273-
/// (`arbitrary_self_types`). However, it should
273+
/// (`arbitrary_self_types_pointers`). However, it should
274274
/// eliminate all undefined behavior related to Rust's
275275
/// stricter aliasing rules than C++.
276276
#[macro_export]

src/reference_wrapper.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use cxx::{memory::UniquePtrTarget, UniquePtr};
3838
/// As noted, one of the main reasons for this type is to call methods.
3939
/// Unfortunately, that depends on unstable Rust features. If you can't
4040
/// call methods on one of these references, check you're using nightly
41-
/// and add `#![feature(arbitrary_self_types)]` to your crate.
41+
/// and add `#![feature(arbitrary_self_types_pointers)]` to your crate.
4242
///
4343
/// # Lifetimes and cloneability
4444
///
@@ -566,7 +566,7 @@ impl<T: ?Sized> AsCppMutRef<T> for PhantomReferentMut<T> {
566566
}
567567
}
568568

569-
#[cfg(all(feature = "arbitrary_self_types", test))]
569+
#[cfg(all(feature = "arbitrary_self_types_pointers", test))]
570570
mod tests {
571571
use super::*;
572572

0 commit comments

Comments
 (0)