-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #114307 - matthiaskrgr:rollup-8k5rq16, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #112858 (Update Android system definitions and add riscv-linux-android as tier 3 target) - #113717 (remove repetitive words) - #113725 (Move MinGW linker dist option to proper section) - #113740 (Update `.gitmodules` to use shallow submodule clones) - #113889 (Fix ice tests when librustc-driver is linked dynamically) - #113906 (etc: add `RUSTC_BOOTSTRAP` to rust-analyzer config) - #113920 (fix(resolve): report unresolved imports firstly) - #114111 (Improve test case for experimental API remove_matches) r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
19 changed files
with
159 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,45 @@ | ||
[submodule "src/doc/nomicon"] | ||
path = src/doc/nomicon | ||
url = https://github.com/rust-lang/nomicon.git | ||
shallow = true | ||
[submodule "src/tools/cargo"] | ||
path = src/tools/cargo | ||
url = https://github.com/rust-lang/cargo.git | ||
shallow = true | ||
[submodule "src/doc/reference"] | ||
path = src/doc/reference | ||
url = https://github.com/rust-lang/reference.git | ||
shallow = true | ||
[submodule "src/doc/book"] | ||
path = src/doc/book | ||
url = https://github.com/rust-lang/book.git | ||
shallow = true | ||
[submodule "src/doc/rust-by-example"] | ||
path = src/doc/rust-by-example | ||
url = https://github.com/rust-lang/rust-by-example.git | ||
shallow = true | ||
[submodule "library/stdarch"] | ||
path = library/stdarch | ||
url = https://github.com/rust-lang/stdarch.git | ||
shallow = true | ||
[submodule "src/doc/rustc-dev-guide"] | ||
path = src/doc/rustc-dev-guide | ||
url = https://github.com/rust-lang/rustc-dev-guide.git | ||
shallow = true | ||
[submodule "src/doc/edition-guide"] | ||
path = src/doc/edition-guide | ||
url = https://github.com/rust-lang/edition-guide.git | ||
shallow = true | ||
[submodule "src/llvm-project"] | ||
path = src/llvm-project | ||
url = https://github.com/rust-lang/llvm-project.git | ||
branch = rustc/16.0-2023-06-05 | ||
shallow = true | ||
[submodule "src/doc/embedded-book"] | ||
path = src/doc/embedded-book | ||
url = https://github.com/rust-embedded/book.git | ||
shallow = true | ||
[submodule "library/backtrace"] | ||
path = library/backtrace | ||
url = https://github.com/rust-lang/backtrace-rs.git | ||
shallow = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions}; | ||
|
||
pub fn target() -> Target { | ||
Target { | ||
llvm_target: "riscv64-linux-android".into(), | ||
pointer_width: 64, | ||
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(), | ||
arch: "riscv64".into(), | ||
options: TargetOptions { | ||
code_model: Some(CodeModel::Medium), | ||
cpu: "generic-rv64".into(), | ||
features: "+m,+a,+f,+d,+c".into(), | ||
llvm_abiname: "lp64d".into(), | ||
supported_sanitizers: SanitizerSet::ADDRESS, | ||
max_atomic_width: Some(64), | ||
..super::android_base::opts() | ||
}, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
pub const ITEM: Item = Item; | ||
|
||
pub struct Item; | ||
|
||
pub fn item() {} | ||
|
||
pub use doesnt_exist::*; | ||
//~^ ERROR unresolved import `doesnt_exist` | ||
mod a { | ||
use crate::{item, Item, ITEM}; | ||
} | ||
|
||
mod b { | ||
use crate::item; | ||
use crate::Item; | ||
use crate::ITEM; | ||
} | ||
|
||
mod c { | ||
use crate::item; | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
error[E0432]: unresolved import `doesnt_exist` | ||
--> $DIR/issue-81413.rs:7:9 | ||
| | ||
LL | pub use doesnt_exist::*; | ||
| ^^^^^^^^^^^^ maybe a missing crate `doesnt_exist`? | ||
| | ||
= help: consider adding `extern crate doesnt_exist` to use the `doesnt_exist` crate | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0432`. |