From 8e1ac04bbfebc9bcfba0698bfa862e6f080fcdc8 Mon Sep 17 00:00:00 2001 From: Amanda Stjerna Date: Wed, 22 May 2024 16:13:53 +0200 Subject: [PATCH] Dusting off this repository - Add a .mailmap redirecting my deadname to my livename - Remove `#![feature(nll)]`, which is not needed anymore --- .mailmap | 2 ++ inputs/drop-liveness/drop-liveness.rs | 2 -- inputs/enum-drop-access/enum-drop-access.rs | 2 -- inputs/issue-47680/issue-47680.rs | 2 -- .../issue-52059-report-when-borrow-and-drop-conflict.rs | 1 - .../maybe-initialized-drop-implicit-fragment-drop.rs | 1 - inputs/smoke-test/polonius-smoke-test.rs | 2 -- inputs/subset-relations/subset-relations.rs | 1 - 8 files changed, 2 insertions(+), 11 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000000..e7c4240c5d8 --- /dev/null +++ b/.mailmap @@ -0,0 +1,2 @@ +Amanda Stjerna +Amanda Stjerna diff --git a/inputs/drop-liveness/drop-liveness.rs b/inputs/drop-liveness/drop-liveness.rs index b1f6e754194..dc6aa516727 100644 --- a/inputs/drop-liveness/drop-liveness.rs +++ b/inputs/drop-liveness/drop-liveness.rs @@ -1,5 +1,3 @@ -#![feature(nll)] - #[derive(Debug)] struct Foo<'a> { data: &'a u32, diff --git a/inputs/enum-drop-access/enum-drop-access.rs b/inputs/enum-drop-access/enum-drop-access.rs index dc436d20fd8..5ef0c3fe73d 100644 --- a/inputs/enum-drop-access/enum-drop-access.rs +++ b/inputs/enum-drop-access/enum-drop-access.rs @@ -1,5 +1,3 @@ -#![feature(nll)] - enum DropOption { Some(T), None, diff --git a/inputs/issue-47680/issue-47680.rs b/inputs/issue-47680/issue-47680.rs index 1f732bb682c..3d36c33af77 100644 --- a/inputs/issue-47680/issue-47680.rs +++ b/inputs/issue-47680/issue-47680.rs @@ -1,5 +1,3 @@ -#![feature(nll)] - struct Thing; impl Thing { diff --git a/inputs/issue-52059-report-when-borrow-and-drop-conflict/issue-52059-report-when-borrow-and-drop-conflict.rs b/inputs/issue-52059-report-when-borrow-and-drop-conflict/issue-52059-report-when-borrow-and-drop-conflict.rs index eaa809d2b37..27bf62ccf16 100644 --- a/inputs/issue-52059-report-when-borrow-and-drop-conflict/issue-52059-report-when-borrow-and-drop-conflict.rs +++ b/inputs/issue-52059-report-when-borrow-and-drop-conflict/issue-52059-report-when-borrow-and-drop-conflict.rs @@ -3,7 +3,6 @@ // one of its fields, it is useful to be reminded of the significance // of the fact that the type implements Drop. -#![feature(nll)] #![allow(dead_code)] pub struct S<'a> { url: &'a mut String } diff --git a/inputs/maybe-initialized-drop-implicit-fragment-drop/maybe-initialized-drop-implicit-fragment-drop.rs b/inputs/maybe-initialized-drop-implicit-fragment-drop/maybe-initialized-drop-implicit-fragment-drop.rs index 5b609820a23..10be73181b1 100644 --- a/inputs/maybe-initialized-drop-implicit-fragment-drop/maybe-initialized-drop-implicit-fragment-drop.rs +++ b/inputs/maybe-initialized-drop-implicit-fragment-drop/maybe-initialized-drop-implicit-fragment-drop.rs @@ -1,5 +1,4 @@ #![allow(warnings)] -#![feature(nll)] struct Wrap<'p> { p: &'p mut i32 } diff --git a/inputs/smoke-test/polonius-smoke-test.rs b/inputs/smoke-test/polonius-smoke-test.rs index 3518691651f..914f4bce951 100644 --- a/inputs/smoke-test/polonius-smoke-test.rs +++ b/inputs/smoke-test/polonius-smoke-test.rs @@ -2,8 +2,6 @@ // ignore-compare-mode-nll // compile-flags: -Z borrowck=mir -Zpolonius -#![feature(nll)] - fn random() -> bool { unimplemented!() } diff --git a/inputs/subset-relations/subset-relations.rs b/inputs/subset-relations/subset-relations.rs index a0577246e2e..b213c64ffd0 100644 --- a/inputs/subset-relations/subset-relations.rs +++ b/inputs/subset-relations/subset-relations.rs @@ -1,5 +1,4 @@ #![crate_type = "lib"] -#![feature(nll)] fn missing_subset<'a, 'b>(x: &'a u32, y: &'b u32) -> &'a u32 { y //~ ERROR