Auto merge of #69550 - RalfJung:scalar, r=oli-obk

[rust.git] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index 3ff5af78097fabfe271d45b0924177dcecdacd12..003e50d0788e4c6efb0d4315556a8c1ce0cf73ef 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,34 +3,31 @@
        url = https://github.com/rust-lang/rust-installer.git
 [submodule "src/doc/nomicon"]
        path = src/doc/nomicon
-       url = https://github.com/rust-lang-nursery/nomicon.git
+       url = https://github.com/rust-lang/nomicon.git
 [submodule "src/tools/cargo"]
        path = src/tools/cargo
        url = https://github.com/rust-lang/cargo.git
 [submodule "src/doc/reference"]
        path = src/doc/reference
-       url = https://github.com/rust-lang-nursery/reference.git
+       url = https://github.com/rust-lang/reference.git
 [submodule "src/doc/book"]
        path = src/doc/book
        url = https://github.com/rust-lang/book.git
 [submodule "src/tools/rls"]
        path = src/tools/rls
-       url = https://github.com/rust-lang-nursery/rls.git
+       url = https://github.com/rust-lang/rls.git
 [submodule "src/tools/clippy"]
        path = src/tools/clippy
-       url = https://github.com/rust-lang-nursery/rust-clippy.git
+       url = https://github.com/rust-lang/rust-clippy.git
 [submodule "src/tools/rustfmt"]
        path = src/tools/rustfmt
-       url = https://github.com/rust-lang-nursery/rustfmt.git
+       url = https://github.com/rust-lang/rustfmt.git
 [submodule "src/tools/miri"]
        path = src/tools/miri
        url = https://github.com/rust-lang/miri.git
 [submodule "src/doc/rust-by-example"]
        path = src/doc/rust-by-example
        url = https://github.com/rust-lang/rust-by-example.git
-[submodule "src/llvm-emscripten"]
-       path = src/llvm-emscripten
-       url = https://github.com/rust-lang/llvm.git
 [submodule "src/stdarch"]
        path = src/stdarch
        url = https://github.com/rust-lang/stdarch.git
@@ -39,11 +36,11 @@
        url = https://github.com/rust-lang/rustc-guide.git
 [submodule "src/doc/edition-guide"]
        path = src/doc/edition-guide
-       url = https://github.com/rust-lang-nursery/edition-guide.git
+       url = https://github.com/rust-lang/edition-guide.git
 [submodule "src/llvm-project"]
        path = src/llvm-project
        url = https://github.com/rust-lang/llvm-project.git
-       branch = rustc/9.0-2019-09-19
+       branch = rustc/9.0-2019-12-19
 [submodule "src/doc/embedded-book"]
        path = src/doc/embedded-book
        url = https://github.com/rust-embedded/book.git