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

Add back the canonicalization chapter. #1532

Merged
merged 2 commits into from
Nov 25, 2023
Merged

Add back the canonicalization chapter. #1532

merged 2 commits into from
Nov 25, 2023

Conversation

crlf0710
Copy link
Member

Fixes #1527

@crlf0710 crlf0710 mentioned this pull request Dec 17, 2022
Closed
@spastorino
Copy link
Member

cc @lcnr

jyn514
jyn514 reviewed Dec 31, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

Thanks! This looks good but it seems strange to add it as a new page instead of replacing canonical-queries (which today doesn't talk about canonical queries at all). Also, putting it under "chalk-based trait solving" seems strange because it doesn't involve chalk at all. Maybe you can rename the current page to "trait queries" and move both to the higher "trait solving section"?

That said, canonical-queries today seems to have a lot of overlap with lowering-to-logic so maybe it makes sense to just remove it altogether? 🤔

@JohnTitor JohnTitor added the S-waiting-on-author Status: this PR is waiting for additional action by the OP label Feb 2, 2023
@spastorino
Copy link
Member

@lcnr thoughts about this?.

@lcnr
Copy link
Contributor

lcnr commented Nov 23, 2023

I don't have an opinion here, it is probably useful to add this. there's some overlap with https://rustc-dev-guide.rust-lang.org/solve/canonicalization.html 🤷

don't feel like i have the capacity to look at this in more detail in the near future, so i am in favor of merging this as is.

@spastorino
Copy link
Member

@crlf0710 I need to read this better but did you look at the overlap lcnr has mentioned?. Maybe we can see how to fix that or at least it may worth adding a FIXME wall of text in the chapter, then merge and fix later.

@crlf0710
Copy link
Member Author

@spastorino I don't think i'm able to apply some in-depth editing to the text, but i added the FIXME note as suggested.

@spastorino spastorino merged commit f4c8255 into rust-lang:master Nov 25, 2023
1 check passed
@rustbot rustbot mentioned this pull request Dec 4, 2023
Merged
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Dec 5, 2023
@fee1-dead
Rollup merge of rust-lang#118614 - rustbot:docs-update, r=ehuss
834a8e8 
Update books

## rust-lang/nomicon

1 commits in 1842257814919fa62e81bdecd5e8f95be2839dbb..83d015105e6d490fc30d6c95da1e56152a50e228
2023-11-22 15:35:31 UTC to 2023-11-22 15:35:31 UTC

- Reword the section on general race conditions (rust-lang/nomicon#431)

## rust-lang/reference

5 commits in cd8193e972f61b92117095fc73b67af767b4d6bc..692d216f5a1151e8852ddb308ba64040e634c876
2023-12-04 09:45:06 UTC to 2023-11-21 17:57:18 UTC

- Fix note on `self` coercion (rust-lang/reference#1431)
- Document C string literal tokens. (rust-lang/reference#1423)
- type-layout.md: Warn about repr(align)/repr(packed) and field order (rust-lang/reference#1430)
- Lone `self` in a method body resolves to the self parameter (rust-lang/reference#1427)
- Reference wildcard patterns from underscore expr (rust-lang/reference#1428)

## rust-lang/rust-by-example

4 commits in a6581246f96837113968c02187db24f742af3908..da0a06aada31a324ae84a9eaee344f6a944b9683
2023-11-27 12:50:49 UTC to 2023-11-21 11:58:19 UTC

- fix tiny typo in string conversion docs (rust-lang/rust-by-example#1776)
- fix(arg): Remove reference to Rust Cookbook in arg parsing (rust-lang/rust-by-example#1775)
- fix:typo error (rust-lang/rust-by-example#1774)
- Remove space between `&` and `self` (rust-lang/rust-by-example#1772)

## rust-lang/rustc-dev-guide

5 commits in ddb8b1309f9e905804cea1e248a4572fed6b464b..904bb5aa7b21adad58ffae610e2830c7b0f813b0
2023-11-28 13:13:36 UTC to 2023-11-22 06:13:00 UTC

- Update how-to-build-and-run.md (rust-lang/rustc-dev-guide#1828)
- notification groups: add information about how to ping them (rust-lang/rustc-dev-guide#1818)
- Add explanations on how to run rustc_codegen_gcc tests (rust-lang/rustc-dev-guide#1821)
- Add back the `canonicalization` chapter. (rust-lang/rustc-dev-guide#1532)
- Emphasize that the experts map is not up to date (rust-lang/rustc-dev-guide#1826)
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 5, 2023
@matthiaskrgr
Rollup merge of rust-lang#118614 - rustbot:docs-update, r=ehuss
4b40b1b 
Update books

## rust-lang/nomicon

1 commits in 1842257814919fa62e81bdecd5e8f95be2839dbb..83d015105e6d490fc30d6c95da1e56152a50e228
2023-11-22 15:35:31 UTC to 2023-11-22 15:35:31 UTC

- Reword the section on general race conditions (rust-lang/nomicon#431)

## rust-lang/reference

5 commits in cd8193e972f61b92117095fc73b67af767b4d6bc..692d216f5a1151e8852ddb308ba64040e634c876
2023-12-04 09:45:06 UTC to 2023-11-21 17:57:18 UTC

- Fix note on `self` coercion (rust-lang/reference#1431)
- Document C string literal tokens. (rust-lang/reference#1423)
- type-layout.md: Warn about repr(align)/repr(packed) and field order (rust-lang/reference#1430)
- Lone `self` in a method body resolves to the self parameter (rust-lang/reference#1427)
- Reference wildcard patterns from underscore expr (rust-lang/reference#1428)

## rust-lang/rust-by-example

4 commits in a6581246f96837113968c02187db24f742af3908..da0a06aada31a324ae84a9eaee344f6a944b9683
2023-11-27 12:50:49 UTC to 2023-11-21 11:58:19 UTC

- fix tiny typo in string conversion docs (rust-lang/rust-by-example#1776)
- fix(arg): Remove reference to Rust Cookbook in arg parsing (rust-lang/rust-by-example#1775)
- fix:typo error (rust-lang/rust-by-example#1774)
- Remove space between `&` and `self` (rust-lang/rust-by-example#1772)

## rust-lang/rustc-dev-guide

5 commits in ddb8b1309f9e905804cea1e248a4572fed6b464b..904bb5aa7b21adad58ffae610e2830c7b0f813b0
2023-11-28 13:13:36 UTC to 2023-11-22 06:13:00 UTC

- Update how-to-build-and-run.md (rust-lang/rustc-dev-guide#1828)
- notification groups: add information about how to ping them (rust-lang/rustc-dev-guide#1818)
- Add explanations on how to run rustc_codegen_gcc tests (rust-lang/rustc-dev-guide#1821)
- Add back the `canonicalization` chapter. (rust-lang/rustc-dev-guide#1532)
- Emphasize that the experts map is not up to date (rust-lang/rustc-dev-guide#1826)
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2023
@rust-timer
Unrolled build for rust-lang#118614
c3e3a50 
Rollup merge of rust-lang#118614 - rustbot:docs-update, r=ehuss

Update books

## rust-lang/nomicon

1 commits in 1842257814919fa62e81bdecd5e8f95be2839dbb..83d015105e6d490fc30d6c95da1e56152a50e228
2023-11-22 15:35:31 UTC to 2023-11-22 15:35:31 UTC

- Reword the section on general race conditions (rust-lang/nomicon#431)

## rust-lang/reference

5 commits in cd8193e972f61b92117095fc73b67af767b4d6bc..692d216f5a1151e8852ddb308ba64040e634c876
2023-12-04 09:45:06 UTC to 2023-11-21 17:57:18 UTC

- Fix note on `self` coercion (rust-lang/reference#1431)
- Document C string literal tokens. (rust-lang/reference#1423)
- type-layout.md: Warn about repr(align)/repr(packed) and field order (rust-lang/reference#1430)
- Lone `self` in a method body resolves to the self parameter (rust-lang/reference#1427)
- Reference wildcard patterns from underscore expr (rust-lang/reference#1428)

## rust-lang/rust-by-example

4 commits in a6581246f96837113968c02187db24f742af3908..da0a06aada31a324ae84a9eaee344f6a944b9683
2023-11-27 12:50:49 UTC to 2023-11-21 11:58:19 UTC

- fix tiny typo in string conversion docs (rust-lang/rust-by-example#1776)
- fix(arg): Remove reference to Rust Cookbook in arg parsing (rust-lang/rust-by-example#1775)
- fix:typo error (rust-lang/rust-by-example#1774)
- Remove space between `&` and `self` (rust-lang/rust-by-example#1772)

## rust-lang/rustc-dev-guide

5 commits in ddb8b1309f9e905804cea1e248a4572fed6b464b..904bb5aa7b21adad58ffae610e2830c7b0f813b0
2023-11-28 13:13:36 UTC to 2023-11-22 06:13:00 UTC

- Update how-to-build-and-run.md (rust-lang/rustc-dev-guide#1828)
- notification groups: add information about how to ping them (rust-lang/rustc-dev-guide#1818)
- Add explanations on how to run rustc_codegen_gcc tests (rust-lang/rustc-dev-guide#1821)
- Add back the `canonicalization` chapter. (rust-lang/rustc-dev-guide#1532)
- Emphasize that the experts map is not up to date (rust-lang/rustc-dev-guide#1826)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 left review comments

@spastorino spastorino spastorino approved these changes

Assignees
No one assigned
Labels
S-waiting-on-author Status: this PR is waiting for additional action by the OP
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

"Canonical queries" section doesn't explain canonical queries
5 participants
@crlf0710 @spastorino @lcnr @jyn514 @JohnTitor