Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes for unsafe extern blocks (RFC 3484) #1536

Merged
merged 9 commits into from
Aug 9, 2024
Merged

Changes for unsafe extern blocks (RFC 3484) #1536

merged 9 commits into from
Aug 9, 2024

Conversation

spastorino
Copy link
Member

@spastorino spastorino commented Jul 18, 2024 •
edited by traviscross
Loading

This goes after this is merged:

...and CI should be happy after that.

I'd say that also this is kind of WIP until someone wouldn't mind fixing my broken english :).

r? @traviscross

Tracking:

@spastorino spastorino mentioned this pull request Jul 18, 2024
Closed
10 tasks
@spastorino spastorino changed the title Impact Unsafe extern blocks changes Impact unsafe extern blocks changes Jul 18, 2024
@traviscross traviscross changed the title Impact unsafe extern blocks changes Changes for unsafe extern blocks (RFC 3484) Jul 21, 2024
@traviscross traviscross self-assigned this Jul 21, 2024
traviscross
traviscross approved these changes Jul 21, 2024
View reviewed changes
Copy link
Contributor

@traviscross traviscross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed and pushed some changes. It looks good to me. We'll merge after...

...is merged.

@traviscross traviscross added the S-waiting-on-stabilization Waiting for a stabilization PR to be merged in the main Rust repository label Jul 21, 2024
@ehuss
Copy link
Contributor

ehuss commented Jul 24, 2024

I pushed some updates here. The major change is to update the grammar, as it should be documenting the pre-validation grammar (since that is what is used for macros).

@ehuss
Copy link
Contributor

ehuss commented Jul 24, 2024

I'll also note that this includes 2024 edition content. I kinda wanted to avoid that, since it is not yet stabilized. I may pull that out into a separate PR before merging this to hold to our process of not documenting unstable features.

@spastorino spastorino force-pushed the unsafe-extern-blocks branch from 123544a to 277dbe4 Compare August 6, 2024 11:42
spastorino and others added 8 commits August 6, 2024 08:46
@spastorino
Impact Unsafe extern blocks changes
d4b5620
@traviscross @spastorino
Revise changes for unsafe extern blocks
2d83af6 
We made an editing pass on the changes for `unsafe extern` blocks.  We
fixed some editorial items and aligned some stylistic points with the
rest of the Reference.  We did some rewording that also had the effect
of minimizing the changes a bit further.

In the examples, we added `safe` and `unsafe` qualifiers to items, as
the RFC suggests that this is the preferred way to write these.
@traviscross @spastorino
Add missing changes to the grammar
d1a7564 
Unsafe extern blocks imply some changes to the grammar.  Let's make
those and note the edition differences.
@traviscross @spastorino
Describe unsafe extern blocks in unsafety chapter
2f5e96b 
Let's add a description of unsafe extern blocks to the chapter about
unsafety.
@ehuss @spastorino
Add the safe weak keyword.
00540f1
@ehuss @spastorino
Add back the ? for unsafe in extern blocks.
66e12f1 
The grammar is intended to show the AST before validation. This is the
grammar accepted by macros, for example.
@ehuss @spastorino
Update extern block grammar to be before validation.
1072b01 
The grammar in the reference defines the grammar before ast validation,
since that is the grammar accepted by macros. Any restrictions imposed
by validation are described in prose (using the term "semantically",
but I don't feel like that is the greatest term to use).
@ehuss @spastorino
Add clarity about safe and unsafe edition difference.
a1a6f29 
The `safe` and `unsafe` item qualifiers can only be used if `unsafe`
is used (pre-2024). I didn't see this specified elsewhere.
@spastorino spastorino force-pushed the unsafe-extern-blocks branch from 277dbe4 to a1a6f29 Compare August 6, 2024 11:47
@spastorino
Copy link
Member Author

@traviscross @ehuss this is now ready as rust-lang/rust#127921 is merged. I've rebased and retriggered CI tests and CI is happy now.

@ehuss
Remove 2024 unsafe extern block notes
875b905 
These will be added back when 2024 stabilizes.
ehuss
ehuss approved these changes Aug 9, 2024
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

I have removed the 2024 changes, which will be added back when 2024 stabilizes. I'll post a PR for that here shortly.

@ehuss ehuss added this pull request to the merge queue Aug 9, 2024
Merged via the queue into rust-lang:master with commit 7226782 Aug 9, 2024
4 checks passed
@ehuss ehuss mentioned this pull request Aug 9, 2024
Merged
@rustbot rustbot mentioned this pull request Aug 12, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 14, 2024
@matthiaskrgr
Rollup merge of rust-lang#129015 - rustbot:docs-update, r=ehuss
d14fa85 
Update books

## rust-lang/book

7 commits in 67fa536768013d9d5a13f3a06790521d511ef711..04bc1396bb857f35b5dda1d773c9571e1f253304
2024-07-31 13:19:44 UTC to 2024-07-16 18:18:38 UTC

- mdbook-trpl-listing: Add missing elided lifetimes (rust-lang/book#3995)
- infra: include ghp-import and git push in generate-preview script (rust-lang/book#3998)
- infra: add robots.txt for GH Pages previews (rust-lang/book#3997)
- Clarify function definitions vs. expressions (rust-lang/book#3870)
- infra: fix some shellcheck issues in CI config (rust-lang/book#3988)
- infra: support test renderer in mdbook preprocessors (rust-lang/book#3982)
- Improve handling of `<Listing>`s (rust-lang/book#3975)

## rust-lang/edition-guide

4 commits in 5454de3d12b9ccc6375b629cf7ccda8264640aac..aeeb287d41a0332c210da122bea8e0e91844ab3e
2024-08-06 21:16:24 UTC to 2024-07-29 21:41:36 UTC

- Stabilize unsafe extern blocks (rust-lang/edition-guide#313)
- Add chapter for Lifetime Capture Rules 2024 (rust-lang/edition-guide#316)
- 2024: Add page for missing_fragment_specifier (rust-lang/edition-guide#315)
- Add documentation for 2024 prelude migration. (rust-lang/edition-guide#314)

## rust-lang/nomicon

3 commits in 0ebdacadbda8ce2cd8fbf93985e15af61a7ab895..6ecf95c5f2bfa0e6314dfe282bf775fd1405f7e9
2024-08-11 16:55:29 UTC to 2024-08-09 23:25:22 UTC

- Stabilize `min_exhaustive_patterns` (rust-lang/nomicon#445)
- repr(int) enums: both size and sign matter (rust-lang/nomicon#458)
- Update what-unsafe-does.md (rust-lang/nomicon#457)

## rust-lang/reference

6 commits in 2e191814f163ee1e77e2d6094eee4dd78a289c5b..62cd0df95061ba0ac886333f5cd7f3012f149da1
2024-08-11 21:06:12 UTC to 2024-07-30 06:34:03 UTC

- Reformat (and only reformat) the inline assembly chapter (rust-lang/reference#1550)
- Changes for unsafe extern blocks (RFC 3484) (rust-lang/reference#1536)
- Stabilize Wasm relaxed SIMD (rust-lang/reference#1421)
- Remove custom blockquote styling (rust-lang/reference#1547)
- Fix std-links for generics with commas. (rust-lang/reference#1549)
- Add details on how names are introduced. (rust-lang/reference#1052)

## rust-lang/rust-by-example

3 commits in 89aecb6951b77bc746da73df8c9f2b2ceaad494a..8f94061936e492159f4f6c09c0f917a7521893ff
2024-08-06 17:25:35 UTC to 2024-07-16 20:58:25 UTC

- Update lifetime_bounds.md (rust-lang/rust-by-example#1869)
- Remove the link to Japanese translation (rust-lang/rust-by-example#1868)
- Add an example of implementing the FromStr trait for Circles. (rust-lang/rust-by-example#1865)

## rust-lang/rustc-dev-guide

12 commits in 0c4d55c..43d8378
2024-08-08 17:54:27 UTC to 2024-07-19 07:15:12 UTC

- Added 'the' in chapter "Running test" subtitle "Run unit tests on the compiler/library" (rust-lang/rustc-dev-guide#2040)
- Correct rust code block in *Dataflow Analysis* (rust-lang/rustc-dev-guide#2037)
- linkcheck: fix filtering of the source files (rust-lang/rustc-dev-guide#2019)
- chore: fix some comments (rust-lang/rustc-dev-guide#2028)
- linkcheck: fix reported broken links (part 2) (rust-lang/rustc-dev-guide#2024)
- typo (rust-lang/rustc-dev-guide#2029)
- Fix broken links in `llvm-coverage-instrumentation.md` (rust-lang/rustc-dev-guide#2027)
- Fix invalid link to toolstate documentation (rust-lang/rustc-dev-guide#2021)
- linkcheck: fix reported broken links (part 1) (rust-lang/rustc-dev-guide#2022)
- fix link (rust-lang/rustc-dev-guide#2020)
- MIR docs: fix borked links and update style (rust-lang/rustc-dev-guide#2017)
- Update adding.md (rust-lang/rustc-dev-guide#2016)
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 15, 2024
@rust-timer
Unrolled build for rust-lang#129015
e5013c2 
Rollup merge of rust-lang#129015 - rustbot:docs-update, r=ehuss

Update books

## rust-lang/book

7 commits in 67fa536768013d9d5a13f3a06790521d511ef711..04bc1396bb857f35b5dda1d773c9571e1f253304
2024-07-31 13:19:44 UTC to 2024-07-16 18:18:38 UTC

- mdbook-trpl-listing: Add missing elided lifetimes (rust-lang/book#3995)
- infra: include ghp-import and git push in generate-preview script (rust-lang/book#3998)
- infra: add robots.txt for GH Pages previews (rust-lang/book#3997)
- Clarify function definitions vs. expressions (rust-lang/book#3870)
- infra: fix some shellcheck issues in CI config (rust-lang/book#3988)
- infra: support test renderer in mdbook preprocessors (rust-lang/book#3982)
- Improve handling of `<Listing>`s (rust-lang/book#3975)

## rust-lang/edition-guide

4 commits in 5454de3d12b9ccc6375b629cf7ccda8264640aac..aeeb287d41a0332c210da122bea8e0e91844ab3e
2024-08-06 21:16:24 UTC to 2024-07-29 21:41:36 UTC

- Stabilize unsafe extern blocks (rust-lang/edition-guide#313)
- Add chapter for Lifetime Capture Rules 2024 (rust-lang/edition-guide#316)
- 2024: Add page for missing_fragment_specifier (rust-lang/edition-guide#315)
- Add documentation for 2024 prelude migration. (rust-lang/edition-guide#314)

## rust-lang/nomicon

3 commits in 0ebdacadbda8ce2cd8fbf93985e15af61a7ab895..6ecf95c5f2bfa0e6314dfe282bf775fd1405f7e9
2024-08-11 16:55:29 UTC to 2024-08-09 23:25:22 UTC

- Stabilize `min_exhaustive_patterns` (rust-lang/nomicon#445)
- repr(int) enums: both size and sign matter (rust-lang/nomicon#458)
- Update what-unsafe-does.md (rust-lang/nomicon#457)

## rust-lang/reference

6 commits in 2e191814f163ee1e77e2d6094eee4dd78a289c5b..62cd0df95061ba0ac886333f5cd7f3012f149da1
2024-08-11 21:06:12 UTC to 2024-07-30 06:34:03 UTC

- Reformat (and only reformat) the inline assembly chapter (rust-lang/reference#1550)
- Changes for unsafe extern blocks (RFC 3484) (rust-lang/reference#1536)
- Stabilize Wasm relaxed SIMD (rust-lang/reference#1421)
- Remove custom blockquote styling (rust-lang/reference#1547)
- Fix std-links for generics with commas. (rust-lang/reference#1549)
- Add details on how names are introduced. (rust-lang/reference#1052)

## rust-lang/rust-by-example

3 commits in 89aecb6951b77bc746da73df8c9f2b2ceaad494a..8f94061936e492159f4f6c09c0f917a7521893ff
2024-08-06 17:25:35 UTC to 2024-07-16 20:58:25 UTC

- Update lifetime_bounds.md (rust-lang/rust-by-example#1869)
- Remove the link to Japanese translation (rust-lang/rust-by-example#1868)
- Add an example of implementing the FromStr trait for Circles. (rust-lang/rust-by-example#1865)

## rust-lang/rustc-dev-guide

12 commits in 0c4d55c..43d8378
2024-08-08 17:54:27 UTC to 2024-07-19 07:15:12 UTC

- Added 'the' in chapter "Running test" subtitle "Run unit tests on the compiler/library" (rust-lang/rustc-dev-guide#2040)
- Correct rust code block in *Dataflow Analysis* (rust-lang/rustc-dev-guide#2037)
- linkcheck: fix filtering of the source files (rust-lang/rustc-dev-guide#2019)
- chore: fix some comments (rust-lang/rustc-dev-guide#2028)
- linkcheck: fix reported broken links (part 2) (rust-lang/rustc-dev-guide#2024)
- typo (rust-lang/rustc-dev-guide#2029)
- Fix broken links in `llvm-coverage-instrumentation.md` (rust-lang/rustc-dev-guide#2027)
- Fix invalid link to toolstate documentation (rust-lang/rustc-dev-guide#2021)
- linkcheck: fix reported broken links (part 1) (rust-lang/rustc-dev-guide#2022)
- fix link (rust-lang/rustc-dev-guide#2020)
- MIR docs: fix borked links and update style (rust-lang/rustc-dev-guide#2017)
- Update adding.md (rust-lang/rustc-dev-guide#2016)
ehuss added a commit to ehuss/reference that referenced this pull request Nov 25, 2024
@ehuss
Add safe keyword to lexer list
fb9701c 
Somehow missed this in rust-lang#1536
@ehuss ehuss mentioned this pull request Nov 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@traviscross traviscross traviscross approved these changes

@ehuss ehuss ehuss approved these changes

Assignees

@traviscross traviscross

Labels
S-waiting-on-stabilization Waiting for a stabilization PR to be merged in the main Rust repository
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@spastorino @ehuss @traviscross