Commit 1f7dcc8

committed

Auto merge of #145958 - Zalathar:rollup-ii9z77c, r=Zalathar

Rollup of 9 pull requests Successful merges: - #142727 (wasm: rm static mut) - #143193 (Port `#[link]` to the new attribute parsing infrastructure ) - #144864 (No source fixes) - #145913 (Add spin_loop hint for LoongArch) - #145926 (compiletest: Remove several remnants of the old libtest-based executor) - #145928 (Rename `Location::file_with_nul` to `file_as_c_str`) - #145930 (`const`ify (the unstable) `str::as_str`) - #145941 (Disable `integer_to_ptr_transmutes` suggestion for unsized types) - #145953 (Update `icu_list` to 2.0) r? `@ghost` `@rustbot` modify labels: rollup

2 parents b416342 + 556d2fa commit 1f7dcc8Copy full SHA for 1f7dcc8

File tree

128 files changed

+2182

-1712

lines changed

Cargo.lock
compiler
- rustc_attr_parsing
  - Cargo.toml
  - messages.ftl
  - src
    - attributes
      - cfg.rs
      - link_attrs.rs
    - context.rs
    - lib.rs
    - session_diagnostics.rs
- rustc_baked_icu_data
  - Cargo.toml
  - src
    - data
    - lib.rs
- rustc_codegen_ssa/src
  - back
    - link.rs
    - link
      - raw_dylib.rs
  - common.rs
  - lib.rs
- rustc_error_codes/src/error_codes
  - E0458.md
- rustc_error_messages
  - Cargo.toml
  - src
    - lib.rs
- rustc_errors/src
  - emitter.rs
- rustc_hir/src/attrs
  - data_structures.rs
  - encode_cross_crate.rs
- rustc_interface/src
  - tests.rs
- rustc_lint/src
  - lints.rs
  - transmute.rs
- rustc_metadata
  - messages.ftl
  - src
    - errors.rs
    - native_libs.rs
- rustc_passes/src
  - check_attr.rs
- rustc_session/src
  - config
    - native_libs.rs
  - cstore.rs
  - utils.rs
- rustc_span/src
  - symbol.rs
library
- core/src
  - hint.rs
  - panic
    - location.rs
  - str
    - mod.rs
- std/src/sys/alloc
  - wasm.rs
src
- bootstrap/src/core/build_steps
  - test.rs
- tools
  - compiletest/src
    - common.rs
    - executor.rs
    - lib.rs
    - runtest.rs
    - runtest
      - run_make.rs
  - tidy/src
    - deps.rs
tests
- crashes
  - 120175.rs
- ui
  - async-await/in-trait
    - dont-project-to-specializable-projection.stderr
  - attributes
    - malformed-attrs.rs
    - malformed-attrs.stderr
  - c-variadic
    - issue-86053-1.stderr
  - closures
    - issue-78720.stderr
    - issue-90871.stderr
  - const-generics/generic_const_exprs
    - expected-type-of-closure-body-to-be-a-closure-or-coroutine-ice-113776.stderr
  - consts
    - issue-89088.stderr
  - derives
    - deriving-meta-unknown-trait.stderr
  - did_you_mean
    - println-typo.stderr
  - error-codes
    - E0458.rs
    - E0458.stderr
  - feature-gates
    - issue-43106-gating-of-builtin-attrs.rs
    - issue-43106-gating-of-builtin-attrs.stderr
  - impl-trait
    - call_method_without_import.no_import.stderr
    - impl-generic-mismatch.stderr
  - imports
    - suggest-remove-issue-121315.stderr
  - issues
    - issue-17546.stderr
    - issue-27033.stderr
  - link-native-libs
    - issue-43925.rs
    - issue-43925.stderr
    - issue-43926.rs
    - issue-43926.stderr
    - link-attr-validation-early.rs
    - link-attr-validation-early.stderr
    - link-attr-validation-late.rs
    - link-attr-validation-late.stderr
    - modifiers-override-4.rs
    - modifiers-override-4.stderr
    - modifiers-override.rs
    - modifiers-override.stderr
  - linkage-attr/raw-dylib/windows
    - import-name-type-invalid-format.rs
    - import-name-type-invalid-format.stderr
    - import-name-type-multiple.rs
    - import-name-type-multiple.stderr
    - import-name-type-unknown-value.rs
    - import-name-type-unknown-value.stderr
    - import-name-type-unsupported-link-kind.rs
    - import-name-type-unsupported-link-kind.stderr
    - import-name-type-x86-only.rs
    - import-name-type-x86-only.stderr
    - link-ordinal-not-foreign-fn.rs
  - lint
    - int_to_ptr-unsized.rs
    - int_to_ptr-unsized.stderr
    - use-redundant
  - macros
    - macro-name-typo.stderr
    - macro-path-prelude-fail-3.stderr
    - missing-writer-issue-139830.stderr
  - malformed
    - malformed-regressions.rs
    - malformed-regressions.stderr
  - methods
    - method-call-lifetime-args-unresolved.stderr
  - parser
    - bad-lit-suffixes.rs
    - bad-lit-suffixes.stderr
    - misspelled-keywords
      - ref.stderr
    - recover
      - recover-pat-exprs.stderr
  - pattern
    - deref-patterns
      - implicit-const-deref.stderr
    - issue-115599.stderr
  - privacy
    - suggest-box-new.stderr
  - proc-macro
    - parent-source-spans.stderr
    - resolve-error.stderr
  - resolve
    - levenshtein.stderr
  - rfcs/rfc-2091-track-caller
    - file-is-nul-terminated.rs
  - suggestions
    - attribute-typos.stderr
    - do-not-attempt-to-add-suggestions-with-no-changes.stderr
    - enum-method-probe.stderr
    - import-trait-for-method-call.stderr
    - multi-suggestion.ascii.stderr
    - multi-suggestion.unicode.stderr
    - suggest-tryinto-edition-change.stderr
  - traits/associated_type_bound
    - assoc_type_bound_with_struct.stderr
  - typeck
    - issue-83693.stderr
  - type
    - issue-7607-1.stderr
  - ufcs
    - ufcs-partially-resolved.stderr
  - wasm
    - wasm-import-module.rs
    - wasm-import-module.stderr

Some content is hidden

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

128 files changed

+2182

-1712

lines changed

`‎Cargo.lock`

Lines changed: 50 additions & 185 deletions

Large diffs are not rendered by default.

`‎compiler/rustc_attr_parsing/Cargo.toml`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ rustc_macros = { path = "../rustc_macros" }`
`17`	`17`	`rustc_parse = { path = "../rustc_parse" }`
`18`	`18`	`rustc_session = { path = "../rustc_session" }`
`19`	`19`	`rustc_span = { path = "../rustc_span" }`
	`20`	`+rustc_target = { path = "../rustc_target" }`
`20`	`21`	`thin-vec.workspace = true`
`21`	`22`	`# tidy-alphabetical-end`

`‎compiler/rustc_attr_parsing/messages.ftl`

Lines changed: 52 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -195,3 +195,55 @@ attr_parsing_invalid_meta_item = expected a literal (`1u8`, `1.0f32`, `"string"`
`195`	`195`
`196`	`196`	`attr_parsing_suffixed_literal_in_attribute = suffixed literals are not allowed in attributes`
`197`	`197`	.help = instead of using a suffixed literal (`1u8`, `1.0f32`, etc.), use an unsuffixed version (`1`, `1.0`, etc.)
	`198`	`+`
	`199`	`+attr_parsing_as_needed_compatibility =`
	`200`	+ linking modifier `as-needed` is only compatible with `dylib` and `framework` linking kinds
	`201`	`+`
	`202`	`+attr_parsing_bundle_needs_static =`
	`203`	+ linking modifier `bundle` is only compatible with `static` linking kind
	`204`	`+`
	`205`	`+attr_parsing_empty_link_name =`
	`206`	`+ link name must not be empty`
	`207`	`+ .label = empty link name`
	`208`	`+`
	`209`	`+attr_parsing_import_name_type_raw =`
	`210`	+ import name type can only be used with link kind `raw-dylib`
	`211`	`+`
	`212`	`+attr_parsing_import_name_type_x86 =`
	`213`	`+ import name type is only supported on x86`
	`214`	`+`
	`215`	`+attr_parsing_incompatible_wasm_link =`
	`216`	+ `wasm_import_module` is incompatible with other arguments in `#[link]` attributes
	`217`	`+`
	`218`	`+attr_parsing_invalid_link_modifier =`
	`219`	`+ invalid linking modifier syntax, expected '+' or '-' prefix before one of: bundle, verbatim, whole-archive, as-needed`
	`220`	`+`
	`221`	`+attr_parsing_link_arg_unstable =`
	`222`	+ link kind `link-arg` is unstable
	`223`	`+`
	`224`	`+attr_parsing_link_cfg_unstable =`
	`225`	`+ link cfg is unstable`
	`226`	`+`
	`227`	`+attr_parsing_link_framework_apple =`
	`228`	+ link kind `framework` is only supported on Apple targets
	`229`	`+`
	`230`	`+attr_parsing_link_requires_name =`
	`231`	+ `#[link]` attribute requires a `name = "string"` argument
	`232`	+ .label = missing `name` argument
	`233`	`+`
	`234`	`+attr_parsing_multiple_modifiers =`
	`235`	+ multiple `{$modifier}` modifiers in a single `modifiers` argument
	`236`	`+`
	`237`	`+attr_parsing_multiple_renamings =`
	`238`	+ multiple renamings were specified for library `{$lib_name}`
	`239`	`+attr_parsing_raw_dylib_no_nul =`
	`240`	+ link name must not contain NUL characters if link kind is `raw-dylib`
	`241`	`+`
	`242`	`+attr_parsing_raw_dylib_elf_unstable =`
	`243`	+ link kind `raw-dylib` is unstable on ELF platforms
	`244`	`+`
	`245`	`+attr_parsing_raw_dylib_only_windows =`
	`246`	+ link kind `raw-dylib` is only supported on Windows targets
	`247`	`+`
	`248`	`+attr_parsing_whole_archive_needs_static =`
	`249`	+ linking modifier `whole-archive` is only compatible with `static` linking kind

`‎compiler/rustc_attr_parsing/src/attributes/cfg.rs`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ pub fn parse_cfg_attr<'c, S: Stage>(`
`36`	`36`	`parse_cfg_entry(cx, single)`
`37`	`37`	`}`
`38`	`38`
`39`		`-fn parse_cfg_entry<S: Stage>(`
	`39`	`+pub(crate)fn parse_cfg_entry<S: Stage>(`
`40`	`40`	`cx: &mut AcceptContext<'_, '_, S>,`
`41`	`41`	`item: &MetaItemOrLitParser<'_>,`
`42`	`42`	`) -> Option<CfgEntry> {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1f7dcc8

File tree

128 files changed

Some content is hidden

128 files changed

`‎Cargo.lock`

`‎compiler/rustc_attr_parsing/Cargo.toml`

`‎compiler/rustc_attr_parsing/messages.ftl`

`‎compiler/rustc_attr_parsing/src/attributes/cfg.rs`

0 commit comments