Skip to content

Commit e52f9e1

Browse files
borsischeinkman
authored andcommitted
Auto merge of rust-lang#51196 - Havvy:remove-keywords, r=petrochenkov
Implement RFC 2421, 'Keyword unreservations (pure, sizeof, alignof, offsetof) On my local machine I was getting failures in `test/ui-fulldeps`, but I was also getting them again after reverting the change, so I'm hoping that this works. I removed the test because that's what the other PR that unreserved a keyword did and I feel that it doesn't make sense/keep value to keep a test for something removed years ago.
1 parent 6846f22 commit e52f9e1

File tree

4,302 files changed

+151
-200156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,302 files changed

+151
-200156
lines changed

.gitmodules

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
[submodule "src/llvm"]
2-
path = src/llvm
3-
url = https://github.com/rust-lang/llvm.git
4-
branch = master
51
[submodule "src/jemalloc"]
62
path = src/jemalloc
73
url = https://github.com/rust-lang/jemalloc.git
@@ -11,39 +7,9 @@
117
[submodule "src/liblibc"]
128
path = src/liblibc
139
url = https://github.com/rust-lang/libc.git
14-
[submodule "src/doc/nomicon"]
15-
path = src/doc/nomicon
16-
url = https://github.com/rust-lang-nursery/nomicon.git
17-
[submodule "src/tools/cargo"]
18-
path = src/tools/cargo
19-
url = https://github.com/rust-lang/cargo.git
20-
[submodule "src/doc/reference"]
21-
path = src/doc/reference
22-
url = https://github.com/rust-lang-nursery/reference.git
23-
[submodule "src/doc/book"]
24-
path = src/doc/book
25-
url = https://github.com/rust-lang/book.git
26-
[submodule "src/tools/rls"]
27-
path = src/tools/rls
28-
url = https://github.com/rust-lang-nursery/rls.git
29-
[submodule "src/libcompiler_builtins"]
30-
path = src/libcompiler_builtins
31-
url = https://github.com/rust-lang-nursery/compiler-builtins.git
32-
[submodule "src/tools/clippy"]
33-
path = src/tools/clippy
34-
url = https://github.com/rust-lang-nursery/rust-clippy.git
35-
[submodule "src/tools/rustfmt"]
36-
path = src/tools/rustfmt
37-
url = https://github.com/rust-lang-nursery/rustfmt.git
38-
[submodule "src/tools/miri"]
39-
path = src/tools/miri
40-
url = https://github.com/solson/miri.git
4110
[submodule "src/dlmalloc"]
4211
path = src/dlmalloc
4312
url = https://github.com/alexcrichton/dlmalloc-rs.git
44-
[submodule "src/doc/rust-by-example"]
45-
path = src/doc/rust-by-example
46-
url = https://github.com/rust-lang/rust-by-example.git
4713
[submodule "src/llvm-emscripten"]
4814
path = src/llvm-emscripten
4915
url = https://github.com/rust-lang/llvm.git
@@ -56,12 +22,3 @@
5622
[submodule "src/libbacktrace"]
5723
path = src/libbacktrace
5824
url = https://github.com/rust-lang-nursery/libbacktrace.git
59-
[submodule "src/tools/lldb"]
60-
path = src/tools/lldb
61-
url = https://github.com/rust-lang-nursery/lldb.git
62-
branch = rust-release-80-v1
63-
[submodule "src/tools/clang"]
64-
path = src/tools/clang
65-
url = https://github.com/rust-lang-nursery/clang.git
66-
branch = rust-release-80-v1
67-

0 commit comments

Comments
 (0)