Skip to content

Rustc pull update #2240

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.

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

Merged
merged 22 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0f65fe0
Merge from rustc
RalfJung Jan 28, 2025
70b3e1a
Merge pull request #4157 from RalfJung/rustup
RalfJung Jan 28, 2025
e952da1
Merge pull request #4161 from oli-obk/push-vnpvrkxznklo
RalfJung Jan 28, 2025
050368d
Merge pull request #4122 from tiif/fnabi
RalfJung Jan 29, 2025
a2813cb
Merge from rustc
Jan 30, 2025
0a83423
Merge pull request #4163 from rust-lang/rustup-2025-01-30
oli-obk Jan 30, 2025
2386fc4
Merge pull request #4140 from geetanshjuneja/deref
RalfJung Jan 30, 2025
688aa82
Merge from rustc
Jan 31, 2025
370ee60
Merge pull request #4166 from rust-lang/rustup-2025-01-31
oli-obk Jan 31, 2025
fae6d5f
Merge from rustc
Feb 1, 2025
cd17f49
Merge pull request #4169 from rust-lang/rustup-2025-02-01
saethlin Feb 1, 2025
c70d1af
Auto merge of #136238 - marcoieni:free-disk-refactor, r=Kobzol
bors Feb 2, 2025
65daf3b
Replace ParseSess::set_dcx with DiagCtxt::set_emitter
bjorn3 Feb 2, 2025
b779470
Rollup merge of #136339 - veera-sivarajan:ignore-arm-unknown-headers,…
matthiaskrgr Feb 2, 2025
4b41bfa
Rollup merge of #136403 - fmease:fix-a-ui-test, r=oli-obk
matthiaskrgr Feb 2, 2025
5fb7fdb
Rollup merge of #136414 - estebank:expected-return-type, r=oli-obk
matthiaskrgr Feb 2, 2025
da2bb39
Rollup merge of #136426 - oli-obk:push-nkpuulwurykn, r=compiler-errors
matthiaskrgr Feb 2, 2025
5bf4046
Rollup merge of #136445 - bjorn3:diag_ctxt_cleanup, r=oli-obk
matthiaskrgr Feb 2, 2025
cce8d5c
Rollup merge of #136452 - RalfJung:miri-sync, r=RalfJung
matthiaskrgr Feb 2, 2025
43dd8e2
Auto merge of #136454 - matthiaskrgr:rollup-ewejzmp, r=matthiaskrgr
bors Feb 2, 2025
40ec7e6
Preparing for merge from rustc
invalid-email-address Feb 3, 2025
37fe574
Merge from rustc
invalid-email-address Feb 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/rustc-interface-getting-diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ extern crate rustc_interface;
extern crate rustc_session;
extern crate rustc_span;

use std::sync::{Arc, Mutex};

use rustc_errors::emitter::Emitter;
use rustc_errors::registry::{self, Registry};
use rustc_errors::translation::Translate;
use rustc_errors::{DiagCtxt, DiagInner, FluentBundle};
use rustc_session::config;
use rustc_span::source_map::SourceMap;

use std::sync::{Arc, Mutex};

struct DebugEmitter {
source_map: Arc<SourceMap>,
diagnostics: Arc<Mutex<Vec<DiagInner>>>,
Expand Down Expand Up @@ -67,10 +67,10 @@ fn main() {
locale_resources: rustc_driver::DEFAULT_LOCALE_RESOURCES.to_owned(),
lint_caps: rustc_hash::FxHashMap::default(),
psess_created: Some(Box::new(|parse_sess| {
parse_sess.set_dcx(DiagCtxt::new(Box::new(DebugEmitter {
parse_sess.dcx().set_emitter(Box::new(DebugEmitter {
source_map: parse_sess.clone_source_map(),
diagnostics,
})));
}));
})),
register_lints: None,
override_queries: None,
Expand Down
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8239a37f9c0951a037cfc51763ea52a20e71e6bd
613bdd49978298648ed05ace086bd1ecad54b44a